diff --git a/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java b/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java
index d1ba478a..5ff46598 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java
@@ -40,11 +40,8 @@ public class EnderStallionModel extends SkeleponyModel<EndermanEntity> {
         isAlicorn = entity.getUuid().getLeastSignificantBits() % 3 == 0;
         isBoss = !isAlicorn && entity.getUuid().getLeastSignificantBits() % 90 == 0;
 
-        leftHorn.visible = rightHorn.visible = !isBoss;
+        leftHorn.visible = rightHorn.visible = isBoss;
         horn.setVisible(!isBoss);
-
-        leftHorn.pitch = 0.5F;
-        rightHorn.pitch = 0.5F;
     }
 
     @Override
@@ -82,9 +79,6 @@ public class EnderStallionModel extends SkeleponyModel<EndermanEntity> {
         tail.setVisible(false);
         snout.setVisible(false);
 
-        leftHorn.visible = visible;
-        rightHorn.visible = visible;
-
         leftSleeve.visible = false;
         rightSleeve.visible = false;
 
diff --git a/src/main/resources/assets/minelittlepony/models/enderman.json b/src/main/resources/assets/minelittlepony/models/enderman.json
index c0c11bc1..20379dd6 100644
--- a/src/main/resources/assets/minelittlepony/models/enderman.json
+++ b/src/main/resources/assets/minelittlepony/models/enderman.json
@@ -8,9 +8,7 @@
 	"head": {
 		"center": [ 0, 0, -2 ],
 		"cubes": [
-			{ "from": [-4, -6, -6], "size": [ 8,  8,  8] },
-			{ "from": [-4, -6, 1], "size": [2, 2, 2], "texture": {"u": 12, "v": 16} },
-			{ "from": [ 2, -6, 1], "size": [2, 2, 2], "texture": {"u": 12, "v": 16}, "mirror": true }
+			{ "from": [-4, -6, -6], "size": [ 8,  8,  8] }
 		],
 		"children": [
 			{
@@ -34,26 +32,37 @@
 			{
 				"name": "left_horn",
 				"texture": {"u": 0, "v": 52},
-				"rotate": [6, 0, -45],
-				"cubes": [ {"size": [0, -4, -1]} ],
+				"center": [-4, -5, -3],
+				"rotate": [200, 0, -45],
+				"cubes": [
+					{ "from": [-1, 0, -1], "size": [2, 6, 2] }
+				],
 				"children": [
 					{
-						"rotate": [0, 0, 51],
-						"center": [-3.9, -6, 0.001],
-						"cubes": [ {"size": [2, 6, 2]} ]
+						"rotate": [0, 0, -51],
+						"center": [-0.5, 5.25, -0.1],
+						"cubes": [
+							{ "from": [-1, 0, -1], "size": [2, 6, 2] }
+						]
 					}
 				]
 			},
 			{
 				"name": "right_horn",
 				"texture": {"u": 8, "v": 52},
-				"rotate": [6, 0, 45],
-				"cubes": [ {"size": [2, -4, -1]} ],
+				"center": [4, -5, -3],
+				"rotate": [200, 0, 45],
+				"cubes": [
+					{ "from": [-1, 0, -1], "size": [2, 6, 2] }
+				],
 				"children": [
 					{
-						"rotate": [0, 0, -51],
-						"center": [3.9, -6, 0.001],
-						"cubes": [ {"size": [2, 6, 2]} ]
+						"rotate": [0, 0, 51],
+						"texture": {"u": 8, "v": 52},
+						"center": [0.5, 5.25, -0.1],
+						"cubes": [
+							{ "from": [-1, 0, -1], "size": [2, 6, 2] }
+						]
 					}
 				]
 			}