diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java
index 3a7b23306..a1a42f789 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java
@@ -15,6 +15,7 @@ import com.google.common.collect.Multimap;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
+import ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors;
 import ellpeck.actuallyadditions.config.ConfigValues;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.util.ItemUtil;
@@ -232,7 +233,7 @@ public class ItemDrill extends ItemEnergy{
     public void registerIcons(IIconRegister iconReg){
         this.allDemDamnIconsMaan = new IIcon[16];
         for(int i = 0; i < this.allDemDamnIconsMaan.length; i++){
-            this.allDemDamnIconsMaan[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+(i+1));
+            this.allDemDamnIconsMaan[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+TheColoredLampColors.values()[i].name);
         }
     }
 
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill5.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrill5.png
deleted file mode 100644
index b349c9008..000000000
Binary files a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill5.png and /dev/null differ
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill16.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlack.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill16.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlack.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill12.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlue.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill12.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillBlue.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill13.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillBrown.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill13.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillBrown.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill10.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillCyan.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill10.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillCyan.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill8.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillGray.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill8.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillGray.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill14.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillGreen.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill14.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillGreen.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill4.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightBlue.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill4.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightBlue.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill9.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightGray.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill9.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillLightGray.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill6.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillLime.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill6.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillLime.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill3.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillMagenta.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill3.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillMagenta.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill2.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillOrange.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill2.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillOrange.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill7.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillPink.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill7.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillPink.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill11.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillPurple.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill11.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillPurple.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill15.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillRed.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill15.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillRed.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrill1.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillWhite.png
similarity index 100%
rename from src/main/resources/assets/actuallyadditions/textures/items/itemDrill1.png
rename to src/main/resources/assets/actuallyadditions/textures/items/itemDrillWhite.png
diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemDrillYellow.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillYellow.png
new file mode 100644
index 000000000..30a6cac8a
Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemDrillYellow.png differ