@@ -97,7 +97,7 @@ BattlescapeState::BattlescapeState(Game *game) : State(game), _popups(), _xBefor
 
 	int screenWidth = Options::baseXResolution;
 	int screenHeight = Options::baseYResolution;
-	int iconsWidth = 320;
+	int iconsWidth = Map::ICON_WIDTH;
 	int iconsHeight = Map::ICON_HEIGHT;
 	_mouseOverIcons = false;
 	// Create buttonbar - this should be on the centerbottom of the screen
 
@@ -575,10 +575,12 @@ bool Camera::isOnScreen(const Position &mapPos) const
 	convertMapToScreen(mapPos, &screenPos);
 	screenPos.x += _mapOffset.x;
 	screenPos.y += _mapOffset.y;
-	return screenPos.x >= -40
+	return screenPos.x >= -32
 		&& screenPos.x <= _screenWidth + 24
 		&& screenPos.y >= -32
-		&& screenPos.y <= _screenHeight - 48;
+		&& ((screenPos.y <= _screenHeight + 8 && (screenPos.x <= _screenWidth / 2 - Map::ICON_WIDTH / 2 || screenPos.x >= _screenWidth / 2 + Map::ICON_WIDTH / 2 - 32))
+		||
+		screenPos.y <= _screenHeight - 16);
 }
 
 /**
 
@@ -435,7 +435,7 @@ void Map::drawTerrain(Surface *surface)
 						}
 					}
 
-					// special handling for a moving large unit.
+					// special handling for a moving unit.
 					if (mapPosition.y > 0)
 					{
 						Tile *tileNorth = _save->getTile(mapPosition - Position(0,1,0));
@@ -454,7 +454,7 @@ void Map::drawTerrain(Surface *surface)
 						/*
 						 * Phase I: rerender the unit to make sure they don't get drawn over any walls or under any tiles
 						 */
-						if (bu && bu->getVisible() && bu->getStatus() == STATUS_WALKING && bu->getArmor()->getSize() != 1 && tile->getTerrainLevel() >= tileNorth->getTerrainLevel())
+						if (bu && bu->getVisible() && bu->getStatus() == STATUS_WALKING && tile->getTerrainLevel() >= tileNorth->getTerrainLevel())
 						{
 							Position tileOffset = Position(16,-8,0);
 							// the part is 0 for small units, large units have parts 1,2 & 3 depending on the relative x/y position of this tile vs the actual unit position.
@@ -1249,15 +1249,6 @@ void Map::calculateWalkingOffset(BattleUnit *unit, Position *offset)
 		else
 			midphase = 1;
 	}
-	else if (dir == 2)
-	{
-		midphase = 1;
-	}
-	else if (dir == 6 || dir == 0)
-	{
-		midphase = endphase;
-	}
-
 	if (unit->getVerticalDirection())
 	{
 		midphase = 4;
 
@@ -75,6 +75,7 @@ class Map : public InteractiveSurface
 	int getTerrainLevel(Position pos, int size);
 public:
 	static const int ICON_HEIGHT = 56;
+	static const int ICON_WIDTH = 320;
 	/// Creates a new map at the specified position and size.
 	Map(Game *game, int width, int height, int x, int y, int visibleMapHeight);
 	/// Cleans up the map.
 
@@ -470,14 +470,6 @@ void BattleUnit::keepWalking(Tile *tileBelowMe, bool cache)
 			else
 				middle = 1;
 		}
-		else if (_direction == 2)
-		{
-			middle = 1;
-		}
-		else if (_direction == 6 || _direction == 0)
-		{
-			middle = end;
-		}
 	}
 	if (!cache)
 	{
Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,7 @@ void Map::drawTerrain(Surface *surface)`
`435`	`435`	`}`
`436`	`436`	`}`
`437`	`437`
`438`		`- // special handling for a moving large unit.`
	`438`	`+ // special handling for a moving unit.`
`439`	`439`	`if (mapPosition.y > 0)`
`440`	`440`	`{`
`441`	`441`	`Tile *tileNorth = _save->getTile(mapPosition - Position(0,1,0));`
`@@ -454,7 +454,7 @@ void Map::drawTerrain(Surface *surface)`
`454`	`454`	`/*`
`455`	`455`	`* Phase I: rerender the unit to make sure they don't get drawn over any walls or under any tiles`
`456`	`456`	`*/`
`457`		`- if (bu && bu->getVisible() && bu->getStatus() == STATUS_WALKING && bu->getArmor()->getSize() != 1 && tile->getTerrainLevel() >= tileNorth->getTerrainLevel())`
	`457`	`+ if (bu && bu->getVisible() && bu->getStatus() == STATUS_WALKING && tile->getTerrainLevel() >= tileNorth->getTerrainLevel())`
`458`	`458`	`{`
`459`	`459`	`Position tileOffset = Position(16,-8,0);`
`460`	`460`	`// the part is 0 for small units, large units have parts 1,2 & 3 depending on the relative x/y position of this tile vs the actual unit position.`
`@@ -1249,15 +1249,6 @@ void Map::calculateWalkingOffset(BattleUnit unit, Position offset)`
`1249`	`1249`	`else`
`1250`	`1250`	`midphase = 1;`
`1251`	`1251`	`}`
`1252`		`- else if (dir == 2)`
`1253`		`- {`
`1254`		`- midphase = 1;`
`1255`		`- }`
`1256`		`- else if (dir == 6 \|\| dir == 0)`
`1257`		`- {`
`1258`		`- midphase = endphase;`
`1259`		`- }`
`1260`		`-`
`1261`	`1252`	`if (unit->getVerticalDirection())`
`1262`	`1253`	`{`
`1263`	`1254`	`midphase = 4;`
Original file line number	Diff line number	Diff line change
`@@ -470,14 +470,6 @@ void BattleUnit::keepWalking(Tile *tileBelowMe, bool cache)`
`470`	`470`	`else`
`471`	`471`	`middle = 1;`
`472`	`472`	`}`
`473`		`- else if (_direction == 2)`
`474`		`- {`
`475`		`- middle = 1;`
`476`		`- }`
`477`		`- else if (_direction == 6 \|\| _direction == 0)`
`478`		`- {`
`479`		`- middle = end;`
`480`		`- }`
`481`	`473`	`}`
`482`	`474`	`if (!cache)`
`483`	`475`	`{`