diff --git a/assets/opencomputers/textures/items/arrow_keys.png b/assets/opencomputers/textures/items/arrow_keys.png
new file mode 100644
index 000000000..7d79aae7c
Binary files /dev/null and b/assets/opencomputers/textures/items/arrow_keys.png differ
diff --git a/assets/opencomputers/textures/items/button_group.png b/assets/opencomputers/textures/items/button_group.png
new file mode 100644
index 000000000..b7081b7ab
Binary files /dev/null and b/assets/opencomputers/textures/items/button_group.png differ
diff --git a/assets/opencomputers/textures/items/numpad.png b/assets/opencomputers/textures/items/numpad.png
new file mode 100644
index 000000000..26dd17ee7
Binary files /dev/null and b/assets/opencomputers/textures/items/numpad.png differ
diff --git a/li/cil/oc/Items.scala b/li/cil/oc/Items.scala
index 84f7ec5dc..b0daf4c7d 100644
--- a/li/cil/oc/Items.scala
+++ b/li/cil/oc/Items.scala
@@ -40,7 +40,7 @@ object Items {
   var circuitBoard: item.Platine = null
   var ironCutter: item.IronCutter = null
   var chip1, chip2, chip3: item.Chip = null
-  var numPad: item.Numpad = null
+  var numPad: item.NumPad = null
   var arrowKeys: item.ArrowKeys = null
   var buttonGroup: item.ButtonGroup = null
   var cpu: item.CPU = null
@@ -85,7 +85,7 @@ object Items {
     chip2 = new item.Chip(multi, 1)
     chip3 = new item.Chip(multi, 2)
 
-    numPad = new item.Numpad(multi)
+    numPad = new item.NumPad(multi)
     arrowKeys = new item.ArrowKeys(multi)
     buttonGroup = new item.ButtonGroup(multi)
 
diff --git a/li/cil/oc/common/item/ArrowKeys.scala b/li/cil/oc/common/item/ArrowKeys.scala
index 493dc25e6..8d0c769ff 100644
--- a/li/cil/oc/common/item/ArrowKeys.scala
+++ b/li/cil/oc/common/item/ArrowKeys.scala
@@ -1,7 +1,14 @@
 package li.cil.oc.common.item
 
+import li.cil.oc.Settings
+import net.minecraft.client.renderer.texture.IconRegister
 
-class ArrowKeys  (val parent: Delegator) extends Delegate {
+class ArrowKeys(val parent: Delegator) extends Delegate {
   val unlocalizedName = "ArrowKeys"
 
+  override def registerIcons(iconRegister: IconRegister) {
+    super.registerIcons(iconRegister)
+
+    icon = iconRegister.registerIcon(Settings.resourceDomain + ":arrow_keys")
+  }
 }
diff --git a/li/cil/oc/common/item/ButtonGroup.scala b/li/cil/oc/common/item/ButtonGroup.scala
index c5d6a1a2c..fd312a60f 100644
--- a/li/cil/oc/common/item/ButtonGroup.scala
+++ b/li/cil/oc/common/item/ButtonGroup.scala
@@ -1,6 +1,14 @@
 package li.cil.oc.common.item
 
+import li.cil.oc.Settings
+import net.minecraft.client.renderer.texture.IconRegister
 
-class ButtonGroup  (val parent: Delegator) extends Delegate {
-  val unlocalizedName = "buttonGroup"
+class ButtonGroup(val parent: Delegator) extends Delegate {
+  val unlocalizedName = "ButtonGroup"
+
+  override def registerIcons(iconRegister: IconRegister) {
+    super.registerIcons(iconRegister)
+
+    icon = iconRegister.registerIcon(Settings.resourceDomain + ":button_group")
+  }
 }
diff --git a/li/cil/oc/common/item/Card.scala b/li/cil/oc/common/item/Card.scala
index 170d28002..6013eb98c 100644
--- a/li/cil/oc/common/item/Card.scala
+++ b/li/cil/oc/common/item/Card.scala
@@ -2,8 +2,7 @@ package li.cil.oc.common.item
 
 import net.minecraft.item.ItemStack
 
-
-class Card(val parent: Delegator,val tier:Int) extends Delegate {
+class Card(val parent: Delegator, val tier: Int) extends Delegate {
   val unlocalizedName = "Card"
 
   override def displayName(stack: ItemStack) = {
@@ -16,7 +15,7 @@ class Card(val parent: Delegator,val tier:Int) extends Delegate {
     else if (tier == 2) {
       Option("Diamond Card")
     }
-    else{
+    else {
       Option(unlocalizedName)
     }
   }
diff --git a/li/cil/oc/common/item/IronCutter.scala b/li/cil/oc/common/item/IronCutter.scala
index b537120a8..0dda73c5b 100644
--- a/li/cil/oc/common/item/IronCutter.scala
+++ b/li/cil/oc/common/item/IronCutter.scala
@@ -1,6 +1,5 @@
 package li.cil.oc.common.item
 
-
-class IronCutter (val parent: Delegator) extends Delegate {
+class IronCutter(val parent: Delegator) extends Delegate {
   val unlocalizedName = "IronCutter"
 }
diff --git a/li/cil/oc/common/item/IronNugget.scala b/li/cil/oc/common/item/IronNugget.scala
index 439284345..b24c07089 100644
--- a/li/cil/oc/common/item/IronNugget.scala
+++ b/li/cil/oc/common/item/IronNugget.scala
@@ -1,15 +1,14 @@
 package li.cil.oc.common.item
 
-import net.minecraft.client.renderer.texture.IconRegister
 import li.cil.oc.Settings
+import net.minecraft.client.renderer.texture.IconRegister
 
-
-class IronNugget (val parent: Delegator) extends Delegate {
+class IronNugget(val parent: Delegator) extends Delegate {
   val unlocalizedName = "IronNugget"
 
   override def registerIcons(iconRegister: IconRegister) = {
     super.registerIcons(iconRegister)
 
-    icon = iconRegister.registerIcon(Settings.resourceDomain + ":iron_nugget" )
+    icon = iconRegister.registerIcon(Settings.resourceDomain + ":iron_nugget")
   }
 }
diff --git a/li/cil/oc/common/item/Numpad.scala b/li/cil/oc/common/item/Numpad.scala
index 74b835647..fd9390fb8 100644
--- a/li/cil/oc/common/item/Numpad.scala
+++ b/li/cil/oc/common/item/Numpad.scala
@@ -1,7 +1,14 @@
 package li.cil.oc.common.item
 
+import li.cil.oc.Settings
+import net.minecraft.client.renderer.texture.IconRegister
 
-class Numpad (val parent: Delegator) extends Delegate {
+class NumPad(val parent: Delegator) extends Delegate {
   val unlocalizedName = "NumPad"
 
+  override def registerIcons(iconRegister: IconRegister) {
+    super.registerIcons(iconRegister)
+
+    icon = iconRegister.registerIcon(Settings.resourceDomain + ":numpad")
+  }
 }
diff --git a/li/cil/oc/common/item/Platine.scala b/li/cil/oc/common/item/Platine.scala
index fe44bc747..25e8e0b9a 100644
--- a/li/cil/oc/common/item/Platine.scala
+++ b/li/cil/oc/common/item/Platine.scala
@@ -1,6 +1,5 @@
 package li.cil.oc.common.item
 
-
-class Platine (val parent: Delegator) extends Delegate {
+class Platine(val parent: Delegator) extends Delegate {
   val unlocalizedName = "Platine"
 }
diff --git a/li/cil/oc/common/item/PlatineBody.scala b/li/cil/oc/common/item/PlatineBody.scala
index c5e924ed6..4f9f86f40 100644
--- a/li/cil/oc/common/item/PlatineBody.scala
+++ b/li/cil/oc/common/item/PlatineBody.scala
@@ -1,6 +1,5 @@
 package li.cil.oc.common.item
 
-
-class PlatineBody (val parent: Delegator) extends Delegate {
-val unlocalizedName = "PlatineBody"
+class PlatineBody(val parent: Delegator) extends Delegate {
+  val unlocalizedName = "PlatineBody"
 }