diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
index 7620e8ccf..d4aa233cf 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
@@ -50,7 +50,8 @@ public enum Icons {
 	UNCHECKED,
     EXIT,
     CHALLENGE_OFF,
-    CHALLENGE_ON;
+    CHALLENGE_ON,
+	RESUME;
 	
 	public Image get() {
 		return get( this );
@@ -143,6 +144,9 @@ public enum Icons {
         case CHALLENGE_ON:
             icon.frame( icon.texture.uvRect( 102, 16, 126, 40 ) );
             break;
+		case RESUME:
+			icon.frame( icon.texture.uvRect( 13, 53, 24, 64 ) );
+			break;
 		}
 		return icon;
 	}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
index 8d66bd379..94e7a5db9 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
@@ -96,13 +96,15 @@ public class Toolbar extends Component {
 				GameScene.selectCell( informer );
 			}
 		} );
-		
+
+		/*
 		add( btnResume = new Tool( 61, 7, 21, 24 ) {
 			@Override
 			protected void onClick() {
 				Dungeon.hero.resume();
 			}
 		} );
+		*/
 		
 		add( btnInventory = new Tool( 82, 7, 23, 24 ) {
 			private GoldIndicator gold;
@@ -129,7 +131,7 @@ public class Toolbar extends Component {
 		
 		add( btnQuick = new QuickslotTool( 105, 7, 22, 24, 0) );
 
-		add( btnQuick2 = new QuickslotTool( 105, 7, 22, 24, 1)) ;
+		btnQuick2 = new QuickslotTool( 105, 7, 22, 24, 1);
 		
 		add( pickedUp = new PickedUpItem() );
 	}
@@ -139,13 +141,15 @@ public class Toolbar extends Component {
 		btnWait.setPos( x, y );
 		btnSearch.setPos( btnWait.right(), y );
 		btnInfo.setPos( btnSearch.right(), y );
-		btnResume.setPos( btnInfo.right(), y );
+		//btnResume.setPos( btnInfo.right(), y );
 		btnQuick.setPos( width - btnQuick.width(), y );
 		btnQuick2.setPos( btnQuick.left() - btnQuick2.width(), y );
 		if (QuickSlots == 2){
+			add(btnQuick2);
 			btnQuick2.visible = btnQuick2.active = true;
 			btnInventory.setPos( btnQuick2.left() - btnInventory.width(), y );
 		} else {
+			remove(btnQuick2);
 			btnQuick2.visible = btnQuick2.active = false;
 			btnInventory.setPos( btnQuick.left() - btnInventory.width(), y );
 		}