diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3edf8c633..adbe854c8 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 
 **Features**
 - Added a debug storage disk
+- Added tooltip to solderer progress bar that shows progress percentage
+- Tweaked grid GUI
 
 ### 0.8.3
 **Bugfixes**
diff --git a/src/main/java/refinedstorage/container/ContainerSolderer.java b/src/main/java/refinedstorage/container/ContainerSolderer.java
index ce594ce1d..78a2fcfc6 100755
--- a/src/main/java/refinedstorage/container/ContainerSolderer.java
+++ b/src/main/java/refinedstorage/container/ContainerSolderer.java
@@ -20,13 +20,13 @@ public class ContainerSolderer extends ContainerBase {
             y += 18;
         }
 
-        addSlotToContainer(new SlotOutput(solderer.getItems(), 3, 134, 38));
+        addSlotToContainer(new SlotOutput(solderer.getItems(), 3, 127, 38));
 
         for (int i = 0; i < 4; ++i) {
             addSlotToContainer(new SlotItemHandler(solderer.getUpgrades(), i, 187, 6 + (i * 18)));
         }
 
-        addPlayerInventory(8, 95);
+        addPlayerInventory(8, 89);
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java
index 27418046a..08029cb43 100755
--- a/src/main/java/refinedstorage/gui/GuiGrid.java
+++ b/src/main/java/refinedstorage/gui/GuiGrid.java
@@ -239,7 +239,7 @@ public class GuiGrid extends GuiBase {
                 ty = 2;
             }
 
-            drawTexture(x + 64, y + 97, 195, ty * 16, 16, 16);
+            drawTexture(x + 152, y + 117, 195, ty * 16, 16, 16);
         }
 
         searchField.drawTextBox();
diff --git a/src/main/java/refinedstorage/gui/GuiSolderer.java b/src/main/java/refinedstorage/gui/GuiSolderer.java
index 3ba9386c6..8b63e7477 100755
--- a/src/main/java/refinedstorage/gui/GuiSolderer.java
+++ b/src/main/java/refinedstorage/gui/GuiSolderer.java
@@ -8,7 +8,7 @@ public class GuiSolderer extends GuiBase {
     private TileSolderer solderer;
 
     public GuiSolderer(ContainerSolderer container, TileSolderer solderer) {
-        super(container, 211, 177);
+        super(container, 211, 171);
 
         this.solderer = solderer;
     }
@@ -29,13 +29,17 @@ public class GuiSolderer extends GuiBase {
         drawTexture(x, y, 0, 0, width, height);
 
         if (solderer.isWorking()) {
-            drawTexture(x + 83, y + 40 - 1, 212, 0, solderer.getProgressScaled(22), 15);
+            drawTexture(x + 83, y + 38 - 1, 212, 0, solderer.getProgressScaled(22), 15);
         }
     }
 
     @Override
     public void drawForeground(int mouseX, int mouseY) {
         drawString(7, 7, t("gui.refinedstorage:solderer"));
-        drawString(7, 82, t("container.inventory"));
+        drawString(7, 77, t("container.inventory"));
+
+        if (inBounds(83, 38, 22, 15, mouseX, mouseY) && solderer.isWorking()) {
+            drawTooltip(mouseX, mouseY, t("gui.refinedstorage:solderer.progress", solderer.getProgressScaled(100)));
+        }
     }
 }
diff --git a/src/main/resources/assets/refinedstorage/lang/en_US.lang b/src/main/resources/assets/refinedstorage/lang/en_US.lang
index e6e397d53..8abc95d90 100755
--- a/src/main/resources/assets/refinedstorage/lang/en_US.lang
+++ b/src/main/resources/assets/refinedstorage/lang/en_US.lang
@@ -13,6 +13,7 @@ gui.refinedstorage:importer=Importer
 gui.refinedstorage:exporter=Exporter
 gui.refinedstorage:detector=Detector
 gui.refinedstorage:solderer=Solderer
+gui.refinedstorage:solderer.progress=%d%%
 gui.refinedstorage:destructor=Destructor
 gui.refinedstorage:constructor=Constructor
 gui.refinedstorage:relay=Relay
diff --git a/src/main/resources/assets/refinedstorage/textures/gui/solderer.png b/src/main/resources/assets/refinedstorage/textures/gui/solderer.png
index 5243c64fb..82d661154 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/gui/solderer.png and b/src/main/resources/assets/refinedstorage/textures/gui/solderer.png differ