diff --git a/rowers/templates/dashboard.html b/rowers/templates/dashboard.html
index 757a852d..8c37989b 100644
--- a/rowers/templates/dashboard.html
+++ b/rowers/templates/dashboard.html
@@ -54,14 +54,14 @@
 		<div id="thumb-container" class="grid_2 alpha">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 			{% elif forloop.counter == 3 %}
 		<div id="thumb-container" class="grid_2 omega">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 
@@ -69,7 +69,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}
@@ -81,14 +81,14 @@
 		<div id="thumb-container" class="grid_2 alpha">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 			{% elif forloop.counter == 3 %}
 		<div id="thumb-container" class="grid_2 omega">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 
@@ -96,7 +96,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}
diff --git a/rowers/templates/list_graphs.html b/rowers/templates/list_graphs.html
index 82415789..dc05fc5e 100644
--- a/rowers/templates/list_graphs.html
+++ b/rowers/templates/list_graphs.html
@@ -23,7 +23,7 @@
 		<div id="thumb-container" class="grid_2">
 		<p class="caption"><a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a></p>
 		<p class="caption">{{ graph.workout.name }}</p>
 		</div>
@@ -46,7 +46,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<p class="caption"><img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a></p>
 		<p class="caption">{{ graph.workout.name }}</p>
 		</div>
diff --git a/rowers/templates/panel_statcharts.html b/rowers/templates/panel_statcharts.html
index e1e44ea9..ac1f0a52 100644
--- a/rowers/templates/panel_statcharts.html
+++ b/rowers/templates/panel_statcharts.html
@@ -4,7 +4,7 @@
 <div id="thumb-container" class="grid_3 alpha">
   <a href="/rowers/graph/{{ graph.id }}/">
     <img src="/{{ graph.filename }}" 
-	 onerror="this.src='/static/img/waiting.png'"
+	 onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	 alt="{{ graph.filename }}" width="180" height="150"></a>
 </div>	
 {% endfor %}
diff --git a/rowers/templates/workout_comments.html b/rowers/templates/workout_comments.html
index f9dbfe7c..d806ef63 100644
--- a/rowers/templates/workout_comments.html
+++ b/rowers/templates/workout_comments.html
@@ -80,14 +80,14 @@
   <div id="thumb-container" class="grid_2 alpha">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   {% elif forloop.counter == 3 %}
   <div id="thumb-container" class="grid_2 omega">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   
@@ -95,7 +95,7 @@
   <div id="thumb-container" class="grid_2">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>
   {% endif %}
@@ -107,14 +107,14 @@
   <div id="thumb-container" class="grid_2 alpha">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   {% elif forloop.counter == 3 %}
   <div id="thumb-container" class="grid_2 omega">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   
@@ -122,7 +122,7 @@
   <div id="thumb-container" class="grid_2">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>
   {% endif %}
diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html
index 6c9c6b25..3aa03f88 100644
--- a/rowers/templates/workout_form.html
+++ b/rowers/templates/workout_form.html
@@ -162,7 +162,7 @@
     <div id="thumb-container" class="grid_2">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>
     {% endif %}
@@ -174,14 +174,14 @@
     <div id="thumb-container" class="grid_2 alpha">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     {% elif forloop.counter == 3 %}
     <div id="thumb-container" class="grid_2 omega">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     
@@ -189,7 +189,7 @@
     <div id="thumb-container" class="grid_2">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>
     {% endif %}
diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index ad3069c1..00b070f5 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -94,30 +94,31 @@
 </div>
 <div id="images" class="grid_6 omega">
 
-	<h1>Images linked to this workout</h1>
-	{% if graphs1 %}
-
-		{% for graph in graphs1 %}
-			{% if forloop.counter == 1 %}
-		<div id="thumb-container" class="grid_2 alpha">
+  <h1>Images linked to this workout</h1>
+  {% if graphs1 %}
+  
+  {% for graph in graphs1 %}
+  {% if forloop.counter == 1 %}
+  <div id="thumb-container" class="grid_2 alpha">
+    <a href="/rowers/graph/{{ graph.id }}/">
+      <img src="/{{ graph.filename }}" 
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
+           
+	   alt="{{ graph.filename }}" width="120" height="100"></a>
+  </div>	
+  {% elif forloop.counter == 3 %}
+  <div id="thumb-container" class="grid_2 omega">
+    <a href="/rowers/graph/{{ graph.id }}/">
+      <img src="/{{ graph.filename }}" 
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
+	   alt="{{ graph.filename }}" width="120" height="100"></a>
+  </div>	
+  
+  {% else %}
+  <div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
-			alt="{{ graph.filename }}" width="120" height="100"></a>
-		</div>	
-			{% elif forloop.counter == 3 %}
-		<div id="thumb-container" class="grid_2 omega">
-		<a href="/rowers/graph/{{ graph.id }}/">
-		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
-			alt="{{ graph.filename }}" width="120" height="100"></a>
-		</div>	
-
-			{% else %}
-		<div id="thumb-container" class="grid_2">
-		<a href="/rowers/graph/{{ graph.id }}/">
-		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}
@@ -129,14 +130,14 @@
 		<div id="thumb-container" class="grid_2 alpha">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 			{% elif forloop.counter == 3 %}
 		<div id="thumb-container" class="grid_2 omega">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 
@@ -144,7 +145,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}