diff --git a/logo.png b/logo.png
index 308617dc9..c50313a38 100755
Binary files a/logo.png and b/logo.png differ
diff --git a/screenshots/interface.png b/screenshots/interface.png
deleted file mode 100755
index 87aad714e..000000000
Binary files a/screenshots/interface.png and /dev/null differ
diff --git a/screenshots/storage_block.png b/screenshots/storage_block.png
deleted file mode 100755
index 6fd38c9ee..000000000
Binary files a/screenshots/storage_block.png and /dev/null differ
diff --git a/src/main/java/refinedstorage/gui/GuiDetector.java b/src/main/java/refinedstorage/gui/GuiDetector.java
index 9b4eefd44..c1e12abdb 100755
--- a/src/main/java/refinedstorage/gui/GuiDetector.java
+++ b/src/main/java/refinedstorage/gui/GuiDetector.java
@@ -68,4 +68,11 @@ public class GuiDetector extends GuiBase {
             super.keyTyped(character, keyCode);
         }
     }
+
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
+        super.mouseClicked(mouseX, mouseY, mouseButton);
+
+        AMOUNT.mouseClicked(mouseX, mouseY, mouseButton);
+    }
 }
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java
index 25d1fa19c..1add94e2e 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCrafterTriggeredAutocrafting.java
@@ -17,7 +17,7 @@ public class SideButtonCrafterTriggeredAutocrafting extends SideButton {
 
     @Override
     protected void drawButtonIcon(int x, int y) {
-        gui.drawTexture(x, y, 0, 144, 16, 16);
+        gui.drawTexture(x, y, TileCrafter.TRIGGERED_AUTOCRAFTING.getValue() ? 0 : 16, 144, 16, 16);
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
index 17ecd711f..e6ea39727 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
@@ -17,7 +17,7 @@ public class SideButtonDetectorMode extends SideButton {
 
     @Override
     protected void drawButtonIcon(int x, int y) {
-        // @TODO: Detector sidebutton icons
+        gui.drawTexture(x, y, TileDetector.MODE.getValue() * 16, 176, 16, 16);
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
index 1027afd23..73b8a879b 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
@@ -17,7 +17,9 @@ public class SideButtonGridSearchBoxMode extends SideButton {
 
     @Override
     protected void drawButtonIcon(int x, int y) {
-        gui.drawTexture(x, y, 0, 96, 16, 16);
+        int mode = ((GuiGrid) gui).getGrid().getSearchBoxMode();
+
+        gui.drawTexture(x, y, mode == TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED ? 16 : 0, 96, 16, 16);
     }
 
     @Override
diff --git a/src/main/resources/assets/refinedstorage/textures/icons.png b/src/main/resources/assets/refinedstorage/textures/icons.png
index ee15bb05c..96f527bd4 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/icons.png and b/src/main/resources/assets/refinedstorage/textures/icons.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/icons_dev.png b/src/main/resources/assets/refinedstorage/textures/icons_dev.png
index 1011bc803..6c583a5ea 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/icons_dev.png and b/src/main/resources/assets/refinedstorage/textures/icons_dev.png differ