diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png
index c3a177804..3e1b1d995 100644
Binary files a/core/src/main/assets/interfaces/icons.png and b/core/src/main/assets/interfaces/icons.png differ
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
index c96ed7f37..81fcc0c60 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
@@ -39,6 +39,9 @@ public enum Icons {
 	EXIT,
 	CLOSE,
 	ARROW,
+	DISPLAY,
+	//TODO UI,
+	AUDIO,
 	
 	//ingame UI icons
 	SKULL,
@@ -118,6 +121,13 @@ public enum Icons {
 		case ARROW:
 			icon.frame( icon.texture.uvRect( 16, 16, 27, 27 ) );
 			break;
+		case DISPLAY:
+			icon.frame( icon.texture.uvRect( 32, 16, 45, 32 ) );
+			break;
+		//TODO UI icon?
+		case AUDIO:
+			icon.frame( icon.texture.uvRect( 64, 16, 77, 28 ) );
+			break;
 			
 		case SKULL:
 			icon.frame( icon.texture.uvRect( 0, 32, 8, 40 ) );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
index 6215b66f9..7682126fc 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndSettings.java
@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.CheckBox;
+import com.shatteredpixel.shatteredpixeldungeon.ui.Icons;
 import com.shatteredpixel.shatteredpixeldungeon.ui.OptionSlider;
 import com.shatteredpixel.shatteredpixeldungeon.ui.RedButton;
 import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock;
@@ -67,7 +68,7 @@ public class WndSettings extends WndTabbed {
 		audio = new AudioTab();
 		add( audio );
 
-		add( new LabeledTab(Messages.get(this, "display")){
+		add( new IconTab(Icons.get(Icons.DISPLAY)){
 			@Override
 			protected void select(boolean value) {
 				super.select(value);
@@ -76,7 +77,7 @@ public class WndSettings extends WndTabbed {
 			}
 		});
 
-		add( new LabeledTab(Messages.get(this, "ui")){
+		add( new IconTab(Icons.get(Icons.PREFS)){
 			@Override
 			protected void select(boolean value) {
 				super.select(value);
@@ -85,7 +86,7 @@ public class WndSettings extends WndTabbed {
 			}
 		});
 
-		add( new LabeledTab(Messages.get(this, "audio")){
+		add( new IconTab(Icons.get(Icons.AUDIO)){
 			@Override
 			protected void select(boolean value) {
 				super.select(value);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java
index 179e7cb02..c36bc2eb7 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java
@@ -268,6 +268,7 @@ public class WndTabbed extends Window {
 					icon.y = y + CUT;
 				}
 			}
+			PixelScene.align(icon);
 		}
 		
 		@Override