diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json
index 0ba47c9b8..a313c71f6 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json
@@ -4,29 +4,21 @@
     "model": "orientable",
     "textures": {
       "side": "refinedstorage:blocks/side",
-      "top": "refinedstorage:blocks/side"
+      "top": "refinedstorage:blocks/side",
+      "front": "refinedstorage:blocks/constructor"
     }
   },
   "variants": {
     "inventory": [
       {
         "y": 0,
-        "transform": "forge:default-block",
-        "textures": {
-          "front": "refinedstorage:blocks/constructor_disconnected"
-        }
+        "transform": "forge:default-block"
       }
     ],
     "connected": {
       "true": {
-        "textures": {
-          "front": "refinedstorage:blocks/constructor_connected"
-        }
       },
       "false": {
-        "textures": {
-          "front": "refinedstorage:blocks/constructor_disconnected"
-        }
       }
     },
     "direction": {
diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json
index 9fc7adc9c..ee6e0422f 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json
@@ -4,29 +4,21 @@
     "model": "orientable",
     "textures": {
       "side": "refinedstorage:blocks/side",
-      "top": "refinedstorage:blocks/side"
+      "top": "refinedstorage:blocks/side",
+      "front": "refinedstorage:blocks/destructor"
     }
   },
   "variants": {
     "inventory": [
       {
         "y": 0,
-        "transform": "forge:default-block",
-        "textures": {
-          "front": "refinedstorage:blocks/destructor_disconnected"
-        }
+        "transform": "forge:default-block"
       }
     ],
     "connected": {
       "true": {
-        "textures": {
-          "front": "refinedstorage:blocks/destructor_connected"
-        }
       },
       "false": {
-        "textures": {
-          "front": "refinedstorage:blocks/destructor_disconnected"
-        }
       }
     },
     "direction": {
diff --git a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json
index e85b1407d..706d18e00 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json
@@ -4,8 +4,8 @@
     "model": "orientable",
     "textures": {
       "side": "refinedstorage:blocks/side",
-      "top": "refinedstorage:blocks/side",
-      "front": "refinedstorage:blocks/processing_pattern_encoder"
+      "top": "refinedstorage:blocks/processing_pattern_encoder",
+      "front": "refinedstorage:blocks/side"
     }
   },
   "variants": {
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png
index 2c0be42c0..8e5289ac5 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png
index 1a8a71440..bdc681b48 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png
index c0a133a58..f3d3e3fc5 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png
index d277b030e..b6a8280b4 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/blocks/destructor_connected.png
rename to src/main/resources/assets/refinedstorage/textures/blocks/constructor.png
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png
deleted file mode 100755
index 1d6dd9488..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_connected.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png
deleted file mode 100755
index 932361b09..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/constructor_disconnected.png and /dev/null differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png
index c1e2a48ea..7479c1b40 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png
similarity index 100%
rename from src/main/resources/assets/refinedstorage/textures/blocks/destructor_disconnected.png
rename to src/main/resources/assets/refinedstorage/textures/blocks/destructor.png
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png
index 885120f4e..68e71b9cb 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png and b/src/main/resources/assets/refinedstorage/textures/blocks/detector_powered.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png
index c8c4c4a91..af89dc634 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png and b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png
index f02eb6e2b..3bda790e0 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png and b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png differ