diff --git a/Minecraft.Client/Common/res/1_2_2/item/armor_stand.png b/Minecraft.Client/Common/res/1_2_2/item/armor_stand.png
index a5dedc87..79459cc5 100644
Binary files a/Minecraft.Client/Common/res/1_2_2/item/armor_stand.png and b/Minecraft.Client/Common/res/1_2_2/item/armor_stand.png differ
diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp
index 1f15e7d4..6ee169d5 100644
--- a/Minecraft.Client/Textures.cpp
+++ b/Minecraft.Client/Textures.cpp
@@ -170,7 +170,7 @@ const wchar_t *Textures::preLoaded[TN_COUNT] =
 	L"item/trapped",
 	L"item/trapped_double",
 
-	L"mob/armorstand/wood",
+	L"item/armor_stand",
 
 
 	//L"item/christmas",
diff --git a/Minecraft.World/ArmorStandItem.h b/Minecraft.World/ArmorStandItem.h
index ebe30ee2..ffe5312d 100644
--- a/Minecraft.World/ArmorStandItem.h
+++ b/Minecraft.World/ArmorStandItem.h
@@ -4,7 +4,7 @@
 class ArmorStandItem : public Item
 {
 public:
-    ArmorStandItem(int id) : Item(id) {}
+    ArmorStandItem(int id) : Item(id) { maxStackSize = 16; }
     virtual ~ArmorStandItem() {}
 
     virtual bool useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player,
diff --git a/Minecraft.World/EntityIO.cpp b/Minecraft.World/EntityIO.cpp
index 22083829..0395c941 100644
--- a/Minecraft.World/EntityIO.cpp
+++ b/Minecraft.World/EntityIO.cpp
@@ -111,7 +111,7 @@ void EntityIO::staticCtor()
       eMinecraftColour_Mob_Rabbit_Colour1,
       eMinecraftColour_Mob_Rabbit_Colour2, IDS_RABBIT);//change IDS_RABBIT later
 
-	setId(ArmorStand::create, eTYPE_ARMORSTAND, L"ArmorStand", 102),
+	setId(ArmorStand::create, eTYPE_ARMORSTAND, L"ArmorStand", 102);
 
 
 	setId(Villager::create, eTYPE_VILLAGER, L"Villager", 120, eMinecraftColour_Mob_Villager_Colour1, eMinecraftColour_Mob_Villager_Colour2, IDS_VILLAGER);