diff --git a/client/src/main/resources/textures/items/black_key.png b/client/src/main/resources/textures/items/black_key.png
new file mode 100644
index 00000000..260b90e4
Binary files /dev/null and b/client/src/main/resources/textures/items/black_key.png differ
diff --git a/client/src/main/resources/textures/items/black_keycard.png b/client/src/main/resources/textures/items/black_keycard.png
new file mode 100644
index 00000000..e259ca5b
Binary files /dev/null and b/client/src/main/resources/textures/items/black_keycard.png differ
diff --git a/client/src/main/resources/textures/items/blue_keycard.png b/client/src/main/resources/textures/items/blue_keycard.png
new file mode 100644
index 00000000..ec5d699d
Binary files /dev/null and b/client/src/main/resources/textures/items/blue_keycard.png differ
diff --git a/client/src/main/resources/textures/items/green_keycard.png b/client/src/main/resources/textures/items/green_keycard.png
new file mode 100644
index 00000000..8a0fecd9
Binary files /dev/null and b/client/src/main/resources/textures/items/green_keycard.png differ
diff --git a/client/src/main/resources/textures/items/key.png b/client/src/main/resources/textures/items/key.png
index 3dbcfb8c..91fd27ab 100755
Binary files a/client/src/main/resources/textures/items/key.png and b/client/src/main/resources/textures/items/key.png differ
diff --git a/client/src/main/resources/textures/items/red_keycard.png b/client/src/main/resources/textures/items/red_keycard.png
new file mode 100755
index 00000000..bc96709c
Binary files /dev/null and b/client/src/main/resources/textures/items/red_keycard.png differ
diff --git a/client/src/main/resources/textures/items/rusty_key.png b/client/src/main/resources/textures/items/rusty_key.png
new file mode 100644
index 00000000..a8e83c4e
Binary files /dev/null and b/client/src/main/resources/textures/items/rusty_key.png differ
diff --git a/client/src/main/resources/textures/items/shiny_key.png b/client/src/main/resources/textures/items/shiny_key.png
new file mode 100644
index 00000000..7f1a95fb
Binary files /dev/null and b/client/src/main/resources/textures/items/shiny_key.png differ
diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java
index 6d56de3e..66ce1083 100755
--- a/common/src/main/java/common/init/ItemRegistry.java
+++ b/common/src/main/java/common/init/ItemRegistry.java
@@ -247,7 +247,7 @@ public abstract class ItemRegistry {
 		register("brick", (new Item()).setDisplay("Ziegel").setTab(CheatTab.MATERIALS));
 		register("clay_lump", (new Item()).setDisplay("Ton").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
 		register("paper", (new Item()).setDisplay("Papier").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.XL).setDefaultColor(0xffffff));
-		register("book", (new ItemBook()).setDisplay("Buch").setTab(CheatTab.MISC));
+		register("book", (new ItemBook()).setDisplay("Buch").setTab(CheatTab.MATERIALS));
 		register("slime_blob", (new Item()).setDisplay("Schleim").setTab(CheatTab.MATERIALS).setMaxAmount(StackSize.L));
 		register("egg", (new ItemEgg()).setDisplay("Ei").setMaxAmount(StackSize.L));
 		register("navigator", (new ItemSpaceNavigator()).setDisplay("Elektronischer Navigator").setTab(CheatTab.TOOLS));
@@ -307,7 +307,7 @@ public abstract class ItemRegistry {
 		register("melon_seed", new ItemSeeds(Blocks.melon_stem, Blocks.farmland).setDisplay("Melonenkerne").setMaxAmount(StackSize.XL));
 		
 		register("whip", (new ItemWhip()).setDisplay("Peitsche"));
-		register("charge_crystal", (new Item()).setDisplay("Energiekristall").setTab(CheatTab.MISC).setColor(Color.DARK_MAGENTA).setGleaming());
+		register("charge_crystal", (new Item()).setDisplay("Energiekristall").setTab(CheatTab.MATERIALS).setColor(Color.DARK_MAGENTA).setGleaming());
 		for(Enchantment ench : Enchantment.values()) {
 			register("enchanted_book_" + ench.getName(), (new ItemEnchantedBook(ench, 1)).setUnstackable().setDisplay("Verzaubertes Buch mit " + ench.getFormattedName(1)).setTab(CheatTab.ENCHANTMENTS));
 			int max = ench.getMaxLevel();
diff --git a/common/src/main/java/common/item/CheatTab.java b/common/src/main/java/common/item/CheatTab.java
index f06cf77e..45c42225 100755
--- a/common/src/main/java/common/item/CheatTab.java
+++ b/common/src/main/java/common/item/CheatTab.java
@@ -129,7 +129,7 @@ public enum CheatTab {
 	},
 	MISC("Verschiedenes", false) {
 		protected Item getIconItem() {
-			return Items.charge_crystal;
+			return Items.record_extend;
 		}
 	},
 	ALL_BLOCKS("Alle Blöcke") {