diff --git a/src/main/java/com/brohoof/minelittlepony/PonyConfig.java b/src/main/java/com/brohoof/minelittlepony/PonyConfig.java
index ada02857..0a6475a0 100644
--- a/src/main/java/com/brohoof/minelittlepony/PonyConfig.java
+++ b/src/main/java/com/brohoof/minelittlepony/PonyConfig.java
@@ -18,8 +18,6 @@ public class PonyConfig implements AdvancedExposable {
     @Expose
     private Value<Boolean> sizes = new Value<Boolean>(true);
     @Expose
-    private Value<Boolean> ponyarmor = new Value<Boolean>(true);
-    @Expose
     private Value<Boolean> snuzzles = new Value<Boolean>(true);
     @Expose
     private Value<Boolean> hd = new Value<Boolean>(true);
@@ -44,10 +42,6 @@ public class PonyConfig implements AdvancedExposable {
         return sizes;
     }
 
-    public Value<Boolean> getPonyArmor() {
-        return ponyarmor;
-    }
-
     public Value<Boolean> getSnuzzles() {
         return snuzzles;
     }
diff --git a/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java b/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java
index 56ecb663..03db6b16 100644
--- a/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java
+++ b/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java
@@ -19,7 +19,6 @@ public class MineLittlePonyGUI extends GuiVoxelBoxSettingsPanel {
     private static final String OPTIONS = _PREFIX + "options";
     private static final String HD = _PREFIX + "hd";
     private static final String SIZES = _PREFIX + "sizes";
-    private static final String PONY_ARMOR = _PREFIX + "ponyarmor";
     private static final String SNUZZLES = _PREFIX + "snuzzles";
     private static final String SHOW_SCALE = _PREFIX + "showscale";
 
@@ -34,7 +33,6 @@ public class MineLittlePonyGUI extends GuiVoxelBoxSettingsPanel {
         this.properties.add(new VoxelPropertyLabel(I18n.format(OPTIONS), PANEL_LEFT + 15, row += 45));
         this.properties.add(check(config.getHd(), HD, PANEL_LEFT + col1, row += 15));
         this.properties.add(check(config.getSizes(), SIZES, PANEL_LEFT + col1, row += 15));
-        this.properties.add(check(config.getPonyArmor(), PONY_ARMOR, PANEL_LEFT + col1, row += 15));
         this.properties.add(check(config.getSnuzzles(), SNUZZLES, PANEL_LEFT + col1, row += 15));
         this.properties.add(check(config.getShowScale(), SHOW_SCALE, PANEL_LEFT + col1, row += 15));
     }
diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java
index a369d015..6dfe7f5c 100644
--- a/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java
+++ b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java
@@ -60,14 +60,14 @@ public class LayerPonyArmor implements LayerRenderer {
 
         if (itemstack != null && itemstack.getItem() instanceof ItemArmor) {
             ItemArmor itemarmor = (ItemArmor) itemstack.getItem();
-            boolean isLegs = armorSlot == 3;
+            boolean isLegs = armorSlot == 2;
 
-            ModelPony modelbase = isLegs ? pony.getArmor().modelArmorChestplate : pony.getArmor().modelArmor;
+            ModelPony modelbase = isLegs ? pony.getArmor().modelArmor : pony.getArmor().modelArmorChestplate;
             modelbase.setModelAttributes(this.pony.getModel());
             modelbase.setLivingAnimations(entitylivingbaseIn, p_177141_2_, p_177141_3_, partialTicks);
             modelbase = getArmorModel(entitylivingbaseIn, itemstack, armorSlot, modelbase);
             prepareToRender((pm_newPonyArmor) modelbase, armorSlot);
-            // this.bindPonyArmorTexture(itemarmor, armorSlot, null);
+
             this.renderer.bindTexture(getArmorTexture(entitylivingbaseIn, itemstack, isLegs ? 2 : 1, null));
             if (itemarmor.getArmorMaterial() == ArmorMaterial.LEATHER) {
                 int j = itemarmor.getColor(itemstack);
diff --git a/src/main/resources/assets/minelittlepony/lang/en_US.lang b/src/main/resources/assets/minelittlepony/lang/en_US.lang
index 57e9933f..2312976d 100644
--- a/src/main/resources/assets/minelittlepony/lang/en_US.lang
+++ b/src/main/resources/assets/minelittlepony/lang/en_US.lang
@@ -9,7 +9,6 @@ minelp.options.ponylevel.both=Both
 minelp.options.options=Pony Options
 minelp.options.hd=Enable MineLP skin server (requries restart)
 minelp.options.sizes=Allow all different sizes of pony
-minelp.options.ponyarmor=Use Mine Little Pony compatible armor
 minelp.options.snuzzles=Display snuzzles on ponies
 minelp.options.showscale=Use show-accurate scaling