diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java
index 89d032650..d29b62445 100644
--- a/src/main/java/appeng/client/render/model/DriveBakedModel.java
+++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java
@@ -71,7 +71,7 @@ public class DriveBakedModel extends DelegateBakedModel {
                     // Position this drive model copy at the correct slot. The transform is based on
                     // the
                     // cell-model being in slot 0,0 at the top left of the drive.
-                    float xOffset = -col * 7 / 16.0f;
+                    float xOffset = -col * 8 / 16.0f;
                     float yOffset = -row * 3 / 16.0f;
                     transform.setTranslation(xOffset, yOffset, 0);
 
diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
index 18c42269f..426ab87a2 100644
--- a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
+++ b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java
@@ -43,8 +43,8 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer<DriveTileEnti
     private static final float R = 13 / 16.f; // right (x-axis)
     private static final float T = 14 / 16.f; // top (x-axis)
     private static final float B = 12.999f / 16.f; // bottom (x-axis)
-    private static final float FR = 0.4f / 16.f; // front (z-axis)
-    private static final float BA = 1 / 16.f; // back (z-axis)
+    private static final float FR = 0.999f / 16.f; // front (z-axis)
+    private static final float BA = 1.499f / 16.f; // back (z-axis)
 
     // Vertex data for the LED cuboid (has no back)
     // Directions are when looking from the front onto the LED
@@ -99,7 +99,7 @@ public class DriveLedTileEntityRenderer extends TileEntityRenderer<DriveTileEnti
                 // Position this drive model copy at the correct slot. The transform is based on
                 // the
                 // cell-model being in slot 0,0 at the top left of the drive.
-                float xOffset = -col * 7 / 16.0f;
+                float xOffset = -col * 8 / 16.0f;
                 float yOffset = -row * 3 / 16.0f;
                 ms.translate(xOffset, yOffset, 0);
 
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json
index e669c8cd2..6ae955650 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json
@@ -1,8 +1,7 @@
 {
-  "credit": "Made with Blockbench",
   "parent": "block/block",
   "textures": {
-    "4": "appliedenergistics2:block/drive/drive_inside",
+    "inside": "appliedenergistics2:block/drive/drive_inside",
     "particle": "appliedenergistics2:block/drive/drive_side",
     "side": "appliedenergistics2:block/drive/drive_side",
     "bottom": "appliedenergistics2:block/drive/drive_bottom",
@@ -13,61 +12,33 @@
     {
       "name": "Right Side Panel",
       "from": [0, 1, 0],
-      "to": [1.5, 15, 16],
+      "to": [1, 15, 16],
       "faces": {
-        "north": {
-          "uv": [14, 1, 16, 15],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "east": {
-          "uv": [0, 0, 16, 16],
-          "rotation": 180,
-          "texture": "#4",
-          "cullface": "north"
-        },
-        "south": {
-          "uv": [0, 1, 2, 15],
-          "texture": "#side",
-          "cullface": "south"
-        },
-        "west": { "uv": [0, 1, 16, 15], "texture": "#side", "cullface": "west" }
+        "north": { "uv": [15, 1, 16, 15], "texture": "#front" },
+        "east": { "uv": [0, 0, 16, 16], "rotation": 180, "texture": "#inside" },
+        "south": { "uv": [0, 1, 1, 15], "texture": "#side" },
+        "west": { "uv": [0, 1, 16, 15], "texture": "#side" }
       }
     },
     {
       "name": "Left Side Panel",
-      "from": [14.5, 1, 0],
+      "from": [15, 1, 0],
       "to": [16, 15, 16],
       "faces": {
-        "north": {
-          "uv": [0, 1, 2, 15],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "east": {
-          "uv": [0, 1, 16, 15],
-          "texture": "#side",
-          "cullface": "east"
-        },
-        "south": {
-          "uv": [14, 1, 16, 15],
-          "texture": "#side",
-          "cullface": "south"
-        },
-        "west": { "uv": [0, 0, 16, 16], "texture": "#4", "cullface": "north" }
+        "north": { "uv": [0, 1, 1, 15], "texture": "#front" },
+        "east": { "uv": [0, 1, 16, 15], "texture": "#side" },
+        "south": { "uv": [15, 1, 16, 15], "texture": "#side" },
+        "west": { "uv": [0, 0, 16, 16], "texture": "#inside" }
       }
     },
     {
       "name": "Back Panel",
-      "from": [1.5, 1, 6],
-      "to": [14.5, 15, 16],
+      "from": [1, 1, 7],
+      "to": [15, 15, 16],
+      "rotation": { "angle": 0, "axis": "y", "origin": [8, 8, 9] },
       "faces": {
-        "north": { "uv": [2, 1, 15, 15], "texture": "#4", "cullface": "north" },
-        "south": {
-          "uv": [1.5, 1, 14.5, 15],
-          "texture": "#side",
-          "cullface": "south"
-        }
+        "north": { "uv": [15, 1, 16, 15], "texture": "#inside" },
+        "south": { "uv": [1, 1, 15, 15], "texture": "#side" }
       }
     },
     {
@@ -75,37 +46,12 @@
       "from": [0, 0, 0],
       "to": [16, 1, 16],
       "faces": {
-        "north": {
-          "uv": [0, 15, 16, 16],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "east": {
-          "uv": [0, 15, 16, 16],
-          "texture": "#side",
-          "cullface": "east"
-        },
-        "south": {
-          "uv": [0, 15, 16, 16],
-          "texture": "#side",
-          "cullface": "south"
-        },
-        "west": {
-          "uv": [0, 15, 16, 16],
-          "texture": "#side",
-          "cullface": "west"
-        },
-        "up": {
-          "uv": [0, 0, 16, 16],
-          "rotation": 90,
-          "texture": "#4",
-          "cullface": "north"
-        },
-        "down": {
-          "uv": [0, 0, 16, 16],
-          "texture": "#bottom",
-          "cullface": "down"
-        }
+        "north": { "uv": [0, 15, 16, 16], "texture": "#front" },
+        "east": { "uv": [0, 15, 16, 16], "texture": "#side" },
+        "south": { "uv": [0, 15, 16, 16], "texture": "#side" },
+        "west": { "uv": [0, 15, 16, 16], "texture": "#side" },
+        "up": { "uv": [0, 0, 16, 16], "rotation": 90, "texture": "#inside" },
+        "down": { "uv": [0, 0, 16, 16], "texture": "#bottom" }
       }
     },
     {
@@ -113,132 +59,62 @@
       "from": [0, 15, 0],
       "to": [16, 16, 16],
       "faces": {
-        "north": {
-          "uv": [0, 0, 16, 1],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "east": { "uv": [0, 0, 16, 1], "texture": "#side", "cullface": "east" },
-        "south": {
-          "uv": [0, 0, 16, 1],
-          "texture": "#side",
-          "cullface": "south"
-        },
-        "west": { "uv": [0, 0, 16, 1], "texture": "#side", "cullface": "west" },
-        "up": { "uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up" },
-        "down": {
-          "uv": [0, 0, 16, 16],
-          "rotation": 270,
-          "texture": "#4",
-          "cullface": "north"
-        }
+        "north": { "uv": [0, 0, 16, 1], "texture": "#front" },
+        "east": { "uv": [0, 0, 16, 1], "texture": "#side" },
+        "south": { "uv": [0, 0, 16, 1], "texture": "#side" },
+        "west": { "uv": [0, 0, 16, 1], "texture": "#side" },
+        "up": { "uv": [0, 0, 16, 16], "texture": "#top" },
+        "down": { "uv": [0, 0, 16, 16], "rotation": 270, "texture": "#inside" }
       }
     },
     {
       "name": "Middle Strut",
-      "from": [7.5, 1, 0],
-      "to": [8.5, 15, 8],
+      "from": [7, 1, 1],
+      "to": [9, 15, 7],
       "faces": {
-        "north": {
-          "uv": [7, 1, 9, 15],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "east": {
-          "uv": [0, 0, 8, 14],
-          "rotation": 180,
-          "texture": "#4",
-          "cullface": "north"
-        },
-        "west": { "uv": [0, 1, 8, 15], "texture": "#4", "cullface": "north" }
+        "north": { "uv": [7, 1, 9, 15], "texture": "#front" },
+        "east": { "uv": [1, 1, 7, 15], "rotation": 180, "texture": "#inside" },
+        "west": { "uv": [1, 1, 7, 15], "texture": "#inside" }
       }
     },
     {
       "name": "Separator",
-      "from": [1.5, 3, 1],
-      "to": [14.5, 4, 8],
+      "from": [1, 3, 2],
+      "to": [15, 4, 7],
       "faces": {
-        "north": {
-          "uv": [1.5, 12, 14.5, 13],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "up": {
-          "uv": [2.5, 1, 13.5, 8],
-          "texture": "#bottom",
-          "cullface": "north"
-        },
-        "down": {
-          "uv": [2.5, 8, 13.5, 15],
-          "texture": "#bottom",
-          "cullface": "north"
-        }
+        "north": { "uv": [1, 12, 15, 13], "texture": "#front" },
+        "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" },
+        "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" }
       }
     },
     {
       "name": "Separator",
-      "from": [1.5, 6, 1],
-      "to": [14.5, 7, 8],
+      "from": [1, 6, 2],
+      "to": [15, 7, 7],
       "faces": {
-        "north": {
-          "uv": [1.5, 9, 14.5, 10],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "up": {
-          "uv": [2.5, 1, 13.5, 8],
-          "texture": "#bottom",
-          "cullface": "north"
-        },
-        "down": {
-          "uv": [2.5, 8, 13.5, 15],
-          "texture": "#bottom",
-          "cullface": "north"
-        }
+        "north": { "uv": [1, 9, 15, 10], "texture": "#front" },
+        "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" },
+        "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" }
       }
     },
     {
       "name": "Separator",
-      "from": [1.5, 9, 1],
-      "to": [14.5, 10, 8],
+      "from": [1, 9, 2],
+      "to": [15, 10, 7],
       "faces": {
-        "north": {
-          "uv": [1.5, 6, 14.5, 7],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "up": {
-          "uv": [2.5, 1, 13.5, 8],
-          "texture": "#bottom",
-          "cullface": "north"
-        },
-        "down": {
-          "uv": [2.5, 8, 13.5, 15],
-          "texture": "#bottom",
-          "cullface": "north"
-        }
+        "north": { "uv": [1, 6, 15, 7], "texture": "#front" },
+        "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" },
+        "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" }
       }
     },
     {
       "name": "Separator",
-      "from": [1.5, 12, 1],
-      "to": [14.5, 13, 8],
+      "from": [1, 12, 2],
+      "to": [15, 13, 7],
       "faces": {
-        "north": {
-          "uv": [1.5, 3, 14.5, 4],
-          "texture": "#front",
-          "cullface": "north"
-        },
-        "up": {
-          "uv": [2.5, 1, 13.5, 8],
-          "texture": "#bottom",
-          "cullface": "north"
-        },
-        "down": {
-          "uv": [2.5, 8, 13.5, 15],
-          "texture": "#bottom",
-          "cullface": "north"
-        }
+        "north": { "uv": [1, 3, 15, 4], "texture": "#front" },
+        "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" },
+        "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" }
       }
     }
   ]
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json
index 6c19c9abf..178a52dc5 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_fluids.json
@@ -1,25 +1,17 @@
 {
   "textures": {
-    "front": "appliedenergistics2:block/drive/drive_cell_states"
+    "front": "appliedenergistics2:block/drive/fluid_cell"
   },
   "elements": [
     {
       "name": "Cell Backdrop",
-      "from": [8.5, 13.0, 0.5],
-      "to": [14.5, 15.0, 2],
+      "from": [9, 13, 1],
+      "to": [15, 15, 3],
+      "rotation": { "angle": 0, "axis": "y", "origin": [9, 8, 8] },
       "faces": {
-        "north": {
-          "texture": "#front",
-          "uv": [0, 12, 5, 14]
-        },
-        "up": {
-          "texture": "#front",
-          "uv": [0, 12, 5, 14]
-        },
-        "down": {
-          "texture": "#front",
-          "uv": [0, 12, 5, 14]
-        }
+        "north": { "uv": [0, 2, 6, 4], "texture": "#front" },
+        "up": { "uv": [0, 0, 6, 2], "texture": "#front" },
+        "down": { "uv": [0, 4, 6, 6], "texture": "#front" }
       }
     }
   ]
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json
index ae2bda54c..a4f06fb19 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_cell_items.json
@@ -1,25 +1,17 @@
 {
   "textures": {
-    "front": "appliedenergistics2:block/drive/drive_cell_states"
+    "front": "appliedenergistics2:block/drive/item_cell"
   },
   "elements": [
     {
       "name": "Cell Backdrop",
-      "from": [8.5, 13.0, 0.5],
-      "to": [14.5, 15.0, 2],
+      "from": [9, 13, 1],
+      "to": [15, 15, 3],
+      "rotation": { "angle": 0, "axis": "y", "origin": [9, 8, 8] },
       "faces": {
-        "north": {
-          "texture": "#front",
-          "uv": [0, 8, 5, 10]
-        },
-        "up": {
-          "texture": "#front",
-          "uv": [0, 8, 5, 10]
-        },
-        "down": {
-          "texture": "#front",
-          "uv": [0, 8, 5, 10]
-        }
+        "north": { "uv": [0, 2, 6, 4], "texture": "#front" },
+        "up": { "uv": [0, 0, 6, 2], "texture": "#front" },
+        "down": { "uv": [0, 4, 6, 6], "texture": "#front" }
       }
     }
   ]
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png
index ef2b20b1c..f66ab0378 100644
Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_inside.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/fluid_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/fluid_cell.png
new file mode 100644
index 000000000..d3abeda66
Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/fluid_cell.png differ
diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/item_cell.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/item_cell.png
new file mode 100644
index 000000000..4c90c29d3
Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/item_cell.png differ