diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java
index 76c65f2ef..dae2f6695 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiDestructor.java
@@ -22,7 +22,7 @@ public class GuiDestructor extends GuiBase {
         addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_NBT));
         addSideButton(new SideButtonCompare(this, TileDestructor.COMPARE, IComparer.COMPARE_OREDICT));
 
-        addSideButton(new SideButtonPickup(this));
+        addSideButton(new SideButtonDestructorPickup(this));
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java
index 317122dc9..830cd9e5c 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonAccessType.java
@@ -18,6 +18,7 @@ public class SideButtonAccessType extends SideButton {
 
     @Override
     protected void drawButtonIcon(int x, int y) {
+        gui.drawTexture(x, y, 16 * parameter.getValue().getId(), 240, 16, 16);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java
index 8721589e9..d69063310 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonCompare.java
@@ -39,11 +39,16 @@ public class SideButtonCompare extends SideButton {
         } else if (mask == IComparer.COMPARE_NBT) {
             ty = 48;
         } else if (mask == IComparer.COMPARE_OREDICT) {
-            return;
+            ty = 224;
         }
 
         int tx = (parameter.getValue() & mask) == mask ? 0 : 16;
 
+        // This is reversed in icons.png :D
+        if (mask == IComparer.COMPARE_OREDICT) {
+            tx = tx == 16 ? 0 : 16;
+        }
+
         gui.drawTexture(x, y, tx, ty, 16, 16);
     }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java
index 94b60a903..fada503a9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonConstuctorDrop.java
@@ -12,7 +12,7 @@ public class SideButtonConstuctorDrop extends SideButton {
 
     @Override
     protected void drawButtonIcon(int x, int y) {
-
+        gui.drawTexture(x, y, 80 + (TileConstructor.DROP.getValue() ? 16 : 0), 16, 16, 16);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonPickup.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDestructorPickup.java
similarity index 79%
rename from src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonPickup.java
rename to src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDestructorPickup.java
index 68ef698b3..ec07ae2f7 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonPickup.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButtonDestructorPickup.java
@@ -5,14 +5,14 @@ import com.raoulvdberge.refinedstorage.tile.TileDestructor;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
 import net.minecraft.util.text.TextFormatting;
 
-public class SideButtonPickup extends SideButton {
-    public SideButtonPickup(GuiBase gui) {
+public class SideButtonDestructorPickup extends SideButton {
+    public SideButtonDestructorPickup(GuiBase gui) {
         super(gui);
     }
 
     @Override
     protected void drawButtonIcon(int x, int y) {
-
+        gui.drawTexture(x, y, 80 + (!TileDestructor.PICKUP.getValue() ? 16 : 0), 0, 16, 16);
     }
 
     @Override
diff --git a/src/main/resources/assets/refinedstorage/textures/icons.png b/src/main/resources/assets/refinedstorage/textures/icons.png
index 30fc92a27..f7bfb95c8 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/logo.png b/src/main/resources/assets/refinedstorage/textures/logo.png
new file mode 100755
index 000000000..765075e08
Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/logo.png differ
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index 0dcfffc46..005e05c3f 100755
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -9,7 +9,7 @@
       "updateUrl": "",
       "authorList": ["Refined Storage contributors"],
       "credits": "",
-      "logoFile": "",
+      "logoFile": "/assets/refinedstorage/textures/logo.png",
       "screenshots": [],
       "dependencies": []
     }