diff --git a/common/buildcraft/robotics/EntityRobot.java b/common/buildcraft/robotics/EntityRobot.java
index 6bb9e880..37ad8e02 100644
--- a/common/buildcraft/robotics/EntityRobot.java
+++ b/common/buildcraft/robotics/EntityRobot.java
@@ -34,9 +34,11 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+
 import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
@@ -831,30 +833,29 @@ public class EntityRobot extends EntityRobotBase implements
 
 	@Override
 	public void aimItemAt(int x, int y, int z) {
-		itemAngle1 = (float) Math.atan2(z - Math.floor(posZ),
-				x - Math.floor(posX));
+		int robotX = (int) Math.floor(posX);
+		int robotY = (int) Math.floor(posY);
+		int robotZ = (int) Math.floor(posZ);
 
+		if (z != robotZ || x != robotX)
+			itemAngle1 = (float) Math.atan2(z - robotZ, x - robotX);
 		itemAngle2 = 0;
 
-		if (Math.floor(posY) < y) {
+		if (robotY < y) {
 			itemAngle2 = (float) -Math.PI / 4;
 
-			if (Math.floor(posX) == x && Math.floor(posZ) == z) {
+			if (robotX == x && robotZ == z) {
 				itemAngle2 -= (float) Math.PI / 4;
 			}
-		} else if (Math.floor(posY) > y) {
+		} else if (robotY > y) {
 			itemAngle2 = (float) Math.PI / 2;
 
-			if (Math.floor(posX) == x && Math.floor(posZ) == z) {
+			if (robotX == x && robotZ == z) {
 				itemAngle2 += (float) Math.PI / 4;
 			}
 		}
 
-		int xComp = (int) Math.floor(posX);
-		int yComp = (int) Math.floor(posY);
-		int zComp = (int) Math.floor(posZ);
-
-		setSteamDirection(xComp - x, yComp - y, zComp - z);
+		setSteamDirection(robotX - x, robotY - y, robotZ - z);
 
 		updateDataServer();
 	}
diff --git a/common/buildcraft/robotics/render/RenderRobot.java b/common/buildcraft/robotics/render/RenderRobot.java
index 49dfd284..1c1c1dbb 100644
--- a/common/buildcraft/robotics/render/RenderRobot.java
+++ b/common/buildcraft/robotics/render/RenderRobot.java
@@ -13,6 +13,7 @@ import java.util.Date;
 import org.lwjgl.opengl.GL11;
 
 import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.entity.Render;
@@ -25,6 +26,8 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
+
+import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.IItemRenderer;
 
 import buildcraft.BuildCraftRobotics;
@@ -158,6 +161,7 @@ public class RenderRobot extends Render implements IItemRenderer {
 		if (robot.getTexture() != null) {
 			renderManager.renderEngine.bindTexture(robot.getTexture());
 			float storagePercent = (float) robot.getBattery().getEnergyStored() / (float) robot.getBattery().getMaxEnergyStored();
+			box.rotateAngleY = -robot.itemAngle1;
 			doRenderRobot(1F / 16F, renderManager.renderEngine, storagePercent, robot.isActive());
 		}
 
@@ -221,14 +225,20 @@ public class RenderRobot extends Render implements IItemRenderer {
 	}
 
 	private void doRenderWearable(EntityRobot entity, TextureManager textureManager, ItemStack wearable) {
+		float robotYaw = 90f + entity.itemAngle1 * 180f / (float)Math.PI;
 		if (wearable.getItem() instanceof IRobotOverlayItem) {
 			((IRobotOverlayItem) wearable.getItem()).renderRobotOverlay(wearable, textureManager);
 		} else if (wearable.getItem() instanceof ItemArmor) {
 			GL11.glPushMatrix();
-			GL11.glScalef(1.125F, 1.125F, 1.125F);
+			GL11.glScalef(1.0125F, 1.0125F, 1.0125F);
+			GL11.glTranslatef(0.0f, -0.25f, 0.0f);
 			GL11.glRotatef(180F, 0, 0, 1);
 			textureManager.bindTexture(RenderBiped.getArmorResource(entity, wearable, 0, null));
-			helmetBox.render(1 / 16F);
+			ModelBiped model = ForgeHooksClient.getArmorModel(entity, wearable, 0, null);
+			if (model != null)
+				model.render(entity, 0, 0, 0, robotYaw, 0, 1 / 16F);
+			else
+				helmetBox.render(1 / 16F);
 			GL11.glPopMatrix();
 		}
 	}