diff --git a/images/whiteboard/attack-indicator-dst-n.png b/images/whiteboard/attack-indicator-dst-n.png
new file mode 100644
index 00000000000..204eb401e1c
Binary files /dev/null and b/images/whiteboard/attack-indicator-dst-n.png differ
diff --git a/images/whiteboard/attack-indicator-dst-ne.png b/images/whiteboard/attack-indicator-dst-ne.png
new file mode 100644
index 00000000000..f64df42c06a
Binary files /dev/null and b/images/whiteboard/attack-indicator-dst-ne.png differ
diff --git a/images/whiteboard/attack-indicator-dst-nw.png b/images/whiteboard/attack-indicator-dst-nw.png
new file mode 100644
index 00000000000..9a21a4ea053
Binary files /dev/null and b/images/whiteboard/attack-indicator-dst-nw.png differ
diff --git a/images/whiteboard/attack-indicator-dst-s.png b/images/whiteboard/attack-indicator-dst-s.png
new file mode 100644
index 00000000000..afd347ee139
Binary files /dev/null and b/images/whiteboard/attack-indicator-dst-s.png differ
diff --git a/images/whiteboard/attack-indicator-dst-se.png b/images/whiteboard/attack-indicator-dst-se.png
new file mode 100644
index 00000000000..2f0ac7c1bf9
Binary files /dev/null and b/images/whiteboard/attack-indicator-dst-se.png differ
diff --git a/images/whiteboard/attack-indicator-dst-sw.png b/images/whiteboard/attack-indicator-dst-sw.png
new file mode 100644
index 00000000000..0f9f479d9dc
Binary files /dev/null and b/images/whiteboard/attack-indicator-dst-sw.png differ
diff --git a/images/whiteboard/attack-indicator-src-n.png b/images/whiteboard/attack-indicator-src-n.png
new file mode 100644
index 00000000000..b9f7ef061bf
Binary files /dev/null and b/images/whiteboard/attack-indicator-src-n.png differ
diff --git a/images/whiteboard/attack-indicator-src-ne.png b/images/whiteboard/attack-indicator-src-ne.png
new file mode 100644
index 00000000000..e82d6cdf884
Binary files /dev/null and b/images/whiteboard/attack-indicator-src-ne.png differ
diff --git a/images/whiteboard/attack-indicator-src-nw.png b/images/whiteboard/attack-indicator-src-nw.png
new file mode 100644
index 00000000000..d5991375961
Binary files /dev/null and b/images/whiteboard/attack-indicator-src-nw.png differ
diff --git a/images/whiteboard/attack-indicator-src-s.png b/images/whiteboard/attack-indicator-src-s.png
new file mode 100644
index 00000000000..a0bed1a38e1
Binary files /dev/null and b/images/whiteboard/attack-indicator-src-s.png differ
diff --git a/images/whiteboard/attack-indicator-src-se.png b/images/whiteboard/attack-indicator-src-se.png
new file mode 100644
index 00000000000..108f35f105a
Binary files /dev/null and b/images/whiteboard/attack-indicator-src-se.png differ
diff --git a/images/whiteboard/attack-indicator-src-sw.png b/images/whiteboard/attack-indicator-src-sw.png
new file mode 100644
index 00000000000..5e94e9edd26
Binary files /dev/null and b/images/whiteboard/attack-indicator-src-sw.png differ
diff --git a/src/whiteboard/attack.cpp b/src/whiteboard/attack.cpp
index 5c5c88d725c..accacf9e78c 100644
--- a/src/whiteboard/attack.cpp
+++ b/src/whiteboard/attack.cpp
@@ -111,7 +111,7 @@ void attack::draw_hex(const map_location& hex)
 {
 	if (hex == get_dest_hex() || hex == target_hex_) //draw attack indicator
 	{
-		//TODO: replace this by either the use of transparency + LAYER_ATTACK_INDICATOR,
+		//@todo: replace this by either the use of transparency + LAYER_ATTACK_INDICATOR,
 		//or a dedicated layer
 		const display::tdrawing_layer layer = display::LAYER_FOOTSTEPS;
 
@@ -124,9 +124,8 @@ void attack::draw_hex(const map_location& hex)
 			int xpos = resources::screen->get_location_x(get_dest_hex());
 			int ypos = resources::screen->get_location_y(get_dest_hex());
 
-			//TODO: Give the whiteboard its own copy of the attack indicator, so it can have a different look.
 			resources::screen->drawing_buffer_add(layer, get_dest_hex(), display::tblit(xpos, ypos,
-					image::get_image("misc/attack-indicator-src-" + direction_text + ".png", image::SCALED_TO_HEX)));
+					image::get_image("whiteboard/attack-indicator-src-" + direction_text + ".png", image::SCALED_TO_HEX)));
 		}
 		else if (hex == target_hex_) //add symbol to defender hex
 		{
@@ -134,7 +133,7 @@ void attack::draw_hex(const map_location& hex)
 			int ypos = resources::screen->get_location_y(target_hex_);
 
 			resources::screen->drawing_buffer_add(layer, target_hex_, display::tblit(xpos, ypos,
-					image::get_image("misc/attack-indicator-dst-" + direction_text + ".png", image::SCALED_TO_HEX)));
+					image::get_image("whiteboard/attack-indicator-dst-" + direction_text + ".png", image::SCALED_TO_HEX)));
 		}
 	}
 }