diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java
index 78b742047..8b0fad77c 100755
--- a/src/main/java/refinedstorage/block/BlockController.java
+++ b/src/main/java/refinedstorage/block/BlockController.java
@@ -28,7 +28,7 @@ import java.util.List;
 
 public class BlockController extends BlockBase {
     public static final PropertyEnum TYPE = PropertyEnum.create("type", EnumControllerType.class);
-    public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 8);
+    public static final PropertyInteger ENERGY = PropertyInteger.create("energy", 0, 7);
 
     public BlockController() {
         super("controller");
diff --git a/src/main/java/refinedstorage/block/BlockDiskDrive.java b/src/main/java/refinedstorage/block/BlockDiskDrive.java
index 5f0bdc9d5..3399c96ea 100755
--- a/src/main/java/refinedstorage/block/BlockDiskDrive.java
+++ b/src/main/java/refinedstorage/block/BlockDiskDrive.java
@@ -37,7 +37,7 @@ public class BlockDiskDrive extends BlockNode {
     @Override
     public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
         return super.getActualState(state, world, pos)
-            .withProperty(STORED, ((TileDiskDrive) world.getTileEntity(pos)).getStoredForDisplay());
+            .withProperty(STORED, ((TileDiskDrive) world.getTileEntity(pos)).getStoredForScaledDisplay());
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
index b9a86af62..cc5972dfb 100755
--- a/src/main/java/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -270,7 +270,7 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag
         return (int) Math.floor((stored / storedMax) * 7f);
     }
 
-    public int getStoredForDisplay() {
+    public int getStoredForScaledDisplay() {
         return stored;
     }
 
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index cee802070..6ed1ef35e 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -662,7 +662,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
     }
 
     public int getEnergyScaledForDisplay() {
-        return getEnergyScaled(8);
+        return getEnergyScaled(7);
     }
 
     public int getEnergyScaledForComparator() {
diff --git a/src/main/resources/assets/refinedstorage/blockstates/controller.json b/src/main/resources/assets/refinedstorage/blockstates/controller.json
index 081716e07..3fdb5566c 100755
--- a/src/main/resources/assets/refinedstorage/blockstates/controller.json
+++ b/src/main/resources/assets/refinedstorage/blockstates/controller.json
@@ -55,11 +55,6 @@
         "textures": {
           "front": "refinedstorage:blocks/controller_7"
         }
-      },
-      "8": {
-        "textures": {
-          "front": "refinedstorage:blocks/controller_8"
-        }
       }
     },
     "type": {
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png
index dc40db41b..c4049f7c0 100644
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_1.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png
index 2b272658b..7f89eb51c 100644
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_2.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png
index a9d310c12..9006af00e 100644
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_3.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png
index f138e3c8b..af95a9f02 100644
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_4.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png
index be1b37459..65418c597 100644
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_5.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png
index 0581bb16e..99770062a 100644
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_6.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png
index be02bc542..7e798a96e 100755
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_7.png differ
diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png
deleted file mode 100755
index 7e798a96e..000000000
Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png and /dev/null differ