diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 4499f502f..b85438a63 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -265,9 +265,11 @@ public class GuiGrid extends GuiBase {
                 if (clickedButton == 1) {
                     flags |= MessageStoragePull.PULL_HALF;
                 }
+
                 if (GuiScreen.isShiftKeyDown()) {
                     flags |= MessageStoragePull.PULL_SHIFT;
                 }
+
                 if (clickedButton == 2) {
                     flags |= MessageStoragePull.PULL_ONE;
                 }
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
index 8f46d3e0a..5313c78d4 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
@@ -18,17 +18,15 @@ public class SideButtonCompare extends SideButton {
 
     @Override
     public String getTooltip(GuiBase gui) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n");
+        String tooltip = TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:compare." + mask) + TextFormatting.RESET + "\n";
 
         if ((config.getCompare() & mask) == mask) {
-            builder.append(gui.t("misc.refinedstorage:yes"));
+            tooltip += gui.t("misc.refinedstorage:yes");
         } else {
-            builder.append(gui.t("misc.refinedstorage:no"));
+            tooltip += gui.t("misc.refinedstorage:no");
         }
 
-        return builder.toString();
+        return tooltip;
     }
 
     @Override
@@ -45,7 +43,7 @@ public class SideButtonCompare extends SideButton {
 
         int tx = (config.getCompare() & mask) == mask ? 0 : 16;
 
-        gui.drawTexture(x, y + 2, tx, ty, 16, 16);
+        gui.drawTexture(x, y + 1, tx, ty, 16, 16);
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
index 43bd88417..7cdcc96f0 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
@@ -17,12 +17,7 @@ public class SideButtonDetectorMode extends SideButton {
 
     @Override
     public String getTooltip(GuiBase gui) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n");
-        builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode()));
-
-        return builder.toString();
+        return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:detector.mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode());
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
index 42f362f9b..b617a2f90 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
@@ -14,12 +14,7 @@ public class SideButtonGridSearchBoxMode extends SideButton {
 
     @Override
     public String getTooltip(GuiBase gui) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:grid.search_box_mode")).append(TextFormatting.RESET).append("\n");
-        builder.append(gui.t("sidebutton.refinedstorage:grid.search_box_mode." + grid.getSearchBoxMode()));
-
-        return builder.toString();
+        return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.search_box_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.search_box_mode." + grid.getSearchBoxMode());
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java
index 0fe678ef8..60f795da4 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java
@@ -14,12 +14,7 @@ public class SideButtonGridSortingDirection extends SideButton {
 
     @Override
     public String getTooltip(GuiBase gui) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:grid.sorting.direction")).append(TextFormatting.RESET).append("\n");
-        builder.append(gui.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection()));
-
-        return builder.toString();
+        return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.sorting.direction") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection());
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java
index 3668dcc21..70c00071b 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java
@@ -14,12 +14,7 @@ public class SideButtonGridSortingType extends SideButton {
 
     @Override
     public String getTooltip(GuiBase gui) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:grid.sorting.type")).append(TextFormatting.RESET).append("\n");
-        builder.append(gui.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType()));
-
-        return builder.toString();
+        return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.sorting.type") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType());
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java
index 663fbcbe2..3a1b7c97c 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java
@@ -15,12 +15,7 @@ public class SideButtonMode extends SideButton {
 
     @Override
     public String getTooltip(GuiBase gui) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n");
-        builder.append(gui.t("sidebutton.refinedstorage:mode." + (config.isWhitelist() ? "whitelist" : "blacklist")));
-
-        return builder.toString();
+        return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:mode." + (config.isWhitelist() ? "whitelist" : "blacklist"));
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java
index 71d30515c..2d5e38497 100755
--- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java
+++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java
@@ -15,12 +15,7 @@ public class SideButtonRedstoneMode extends SideButton {
 
     @Override
     public String getTooltip(GuiBase gui) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n");
-        builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + config.getRedstoneMode().id));
-
-        return builder.toString();
+        return TextFormatting.RED + gui.t("sidebutton.refinedstorage:redstone_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:redstone_mode." + config.getRedstoneMode().id);
     }
 
     @Override