diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
index 317020223..0d8b3473f 100644
--- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java
+++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java
@@ -246,6 +246,7 @@ public final class ApiBlocks implements IBlocks
 				.build();
 		this.quartzOreCharged = registry.block( "charged_quartz_ore", BlockChargedQuartzOre::new )
 				.features( AEFeature.CERTUS_ORE, AEFeature.CHARGED_CERTUS_ORE )
+				.useCustomItemModel()
 				.bootstrap( ( block, item ) -> (IOreDictComponent) side -> OreDictionary.registerOre( "oreCertusQuartz", new ItemStack( block ) ) )
 				.build();
 		this.matrixFrame = registry.block( "matrix_frame", BlockMatrixFrame::new ).features( AEFeature.SPATIAL_IO ).build();
diff --git a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
index fda7badac..dc965c20f 100644
--- a/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/blockstates/charged_quartz_ore.json
@@ -1,7 +1,16 @@
 {
-    "variants": {
-        "normal": {
-            "model": "appliedenergistics2:charged_quartz_ore"
+    "forge_marker": 1,
+    "defaults": {
+        "textures": {
+            "all": "appliedenergistics2:blocks/charged_quartz_ore"
         }
+    },
+    "variants": {
+        "normal": [{
+            "model": "appliedenergistics2:charged_quartz_ore"
+        }],
+        "inventory": [{
+            "model": "cube_all"
+        }]
     }
 }
diff --git a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
index ab02b96a0..31dca99c8 100644
--- a/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
+++ b/src/main/resources/assets/appliedenergistics2/models/block/charged_quartz_ore.json
@@ -1,6 +1,99 @@
 {
-    "parent": "block/cube_all",
+    "uvlMarker": true,
+    "parent": "block/block",
     "textures": {
-        "all": "appliedenergistics2:blocks/charged_quartz_ore"
-    }
+        "block": "blocks/stone",
+        "quartz": "appliedenergistics2:blocks/charged_quartz_ore_light"
+    },    
+    "elements": [
+        {
+           "faces": {
+                "down": {
+                    "texture": "#block"
+                },
+                "east": {
+                    "texture": "#block"
+                },
+                "north": {
+                    "texture": "#block"
+                },
+                "south": {
+                    "texture": "#block"
+                },
+                "up": {
+                    "texture": "#block"
+                },
+                "west": {
+                    "texture": "#block"
+                }
+            },
+            "from": [
+                0,
+                0,
+                0
+            ],
+            "to": [
+                16,
+                16,
+                16
+            ]
+        },
+        {
+           "faces": {
+                "down": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "east": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "north": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "south": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "up": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                },
+                "west": {
+                    "texture": "#quartz",
+                    "uvlightmap": {
+                        "block": 0.007,
+                        "sky": 0.007
+                    }
+                }
+            },
+            "from": [
+                0,
+                0,
+                0
+            ],
+            "shade": false,
+            "to": [
+                16,
+                16,
+                16
+            ]
+        }
+    ]
 }
diff --git a/src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore_light.png b/src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore_light.png
new file mode 100644
index 000000000..0aab6f20c
Binary files /dev/null and b/src/main/resources/assets/appliedenergistics2/textures/blocks/charged_quartz_ore_light.png differ