diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java
index 3d2c803ad..848add815 100755
--- a/src/main/java/refinedstorage/block/BlockSolderer.java
+++ b/src/main/java/refinedstorage/block/BlockSolderer.java
@@ -5,7 +5,6 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
@@ -59,11 +58,6 @@ public class BlockSolderer extends BlockNode {
         return false;
     }
 
-    @Override
-    public BlockRenderLayer getBlockLayer() {
-        return BlockRenderLayer.TRANSLUCENT;
-    }
-
     @Override
     public EnumPlacementType getPlacementType() {
         return EnumPlacementType.HORIZONTAL;
diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json
index 27d066cd3..950752060 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json
@@ -3,8 +3,9 @@
   "defaults": {
     "model": "refinedstorage:solderer",
     "textures": {
-      "particle": "refinedstorage:blocks/solderer_side"
-    }
+      "particle": "refinedstorage:blocks/solderer_top"
+    },
+    "uvlock": false
   },
   "variants": {
     "inventory": [
diff --git a/src/main/resources/assets/refinedstorage/models/block/solderer.json b/src/main/resources/assets/refinedstorage/models/block/solderer.json
index c2883a841..3d88548fa 100755
--- a/src/main/resources/assets/refinedstorage/models/block/solderer.json
+++ b/src/main/resources/assets/refinedstorage/models/block/solderer.json
@@ -6,9 +6,7 @@
     "2": "refinedstorage:blocks/solderer_bottom",
     "3": "refinedstorage:blocks/solderer_middle",
     "4": "refinedstorage:blocks/solderer_roof",
-    "5": "refinedstorage:blocks/solderer_elements",
-    "6": "refinedstorage:blocks/solderer_glass",
-    "-1": "refinedstorage:blocks/solderer_glass"
+    "5": "refinedstorage:blocks/solderer_elements"
   },
   "elements": [
     {
@@ -976,282 +974,6 @@
           ]
         }
       }
-    },
-    {
-      "name": "Window1",
-      "from": [
-        2.0,
-        7.0,
-        14.0
-      ],
-      "to": [
-        14.0,
-        13.0,
-        15.0
-      ],
-      "faces": {
-        "north": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "east": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "south": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "west": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "up": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            12.0,
-            1.0
-          ]
-        },
-        "down": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            12.0,
-            1.0
-          ]
-        }
-      }
-    },
-    {
-      "name": "Window2",
-      "from": [
-        2.0,
-        7.0,
-        1.0
-      ],
-      "to": [
-        14.0,
-        13.0,
-        2.0
-      ],
-      "faces": {
-        "north": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "east": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "south": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "west": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "up": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            12.0,
-            1.0
-          ]
-        },
-        "down": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            12.0,
-            1.0
-          ]
-        }
-      }
-    },
-    {
-      "name": "Window3",
-      "from": [
-        14.0,
-        7.0,
-        2.0
-      ],
-      "to": [
-        15.0,
-        13.0,
-        14.0
-      ],
-      "faces": {
-        "north": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "east": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "south": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "west": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "up": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            12.0
-          ]
-        },
-        "down": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            12.0
-          ]
-        }
-      }
-    },
-    {
-      "name": "Window4",
-      "from": [
-        1.0,
-        7.0,
-        2.0
-      ],
-      "to": [
-        2.0,
-        13.0,
-        14.0
-      ],
-      "faces": {
-        "north": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "east": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "south": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            6.0
-          ]
-        },
-        "west": {
-          "texture": "#6",
-          "uv": [
-            2.0,
-            5.0,
-            14.0,
-            11.0
-          ]
-        },
-        "up": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            12.0
-          ]
-        },
-        "down": {
-          "texture": "#-1",
-          "uv": [
-            0.0,
-            0.0,
-            1.0,
-            12.0
-          ]
-        }
-      }
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png
deleted file mode 100755
index 0ff7c19c6..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png and /dev/null differ