diff --git a/src/Gui/MapPanel.cs b/src/Gui/MapPanel.cs
index 82a6965..0da67c2 100644
--- a/src/Gui/MapPanel.cs
+++ b/src/Gui/MapPanel.cs
@@ -20,6 +20,7 @@ namespace WorldOfPeacecraft
 		private Image Knight;
 		private Image Walkable;
 		private Image Water;
+		private Image Wall;
 		private Dictionary<int, int> dragonImageMappings = new Dictionary<int, int>();
 		private Random random = new Random ();
 
@@ -36,6 +37,7 @@ namespace WorldOfPeacecraft
 			Knight = Image.FromFile (ImagesFolder + "knight.png");
 			Walkable = Image.FromFile (ImagesFolder + "walkable.jpg");
 			Water = Image.FromFile (ImagesFolder + "water.jpg");
+			Wall = Image.FromFile(ImagesFolder + "wall.jpg");
 		}
 
 		protected override void OnLayout (LayoutEventArgs levent)
@@ -107,6 +109,8 @@ namespace WorldOfPeacecraft
 			Image image = null;
 			if (tile.IsWater ()) {
 				image = Water;
+			} else if (tile.IsWall ()) {
+				image = Wall;
 			}
 			else {
 				image = Walkable;
@@ -116,9 +120,6 @@ namespace WorldOfPeacecraft
 			} else {
 				g.FillRectangle(new SolidBrush(Color.Red), x, y, TileSize, TileSize);
 			}
-			if (tile.IsWall ()) {
-				g.FillEllipse(new SolidBrush(Color.Gray), x + 3, y + 3, TileSize - 6 , TileSize - 6); 
-			}
 			if (tile.IsForest ()) {
 				PaintImage (g, x, y, Forest);
 			}