diff --git a/images/toggle-closed.gif b/images/toggle-closed.gif
index 805e57d1d..07daef067 100644
Binary files a/images/toggle-closed.gif and b/images/toggle-closed.gif differ
diff --git a/images/toggle-open.gif b/images/toggle-open.gif
index 07daef067..805e57d1d 100644
Binary files a/images/toggle-open.gif and b/images/toggle-open.gif differ
diff --git a/javascript/ToggleField.js b/javascript/ToggleField.js
index de660b232..e41a38255 100644
--- a/javascript/ToggleField.js
+++ b/javascript/ToggleField.js
@@ -4,26 +4,29 @@ ToggleField.prototype = {
 		var rules = {};
 		rules['#' + this.id + ' .triggerMore'] = {
 			onclick: function(e) {
-				this.toggle();
+				Element.toggle(this);
 				Event.stop(e); return false;
 			}.bind(this)
 		};
 		rules['#' + this.id + ' .triggerLess'] = {
 			onclick: function(e) {
-				this.toggle();
+				Element.toggle(this);
 				Event.stop(e); return false;
 			}.bind(this)
 		};
 		Behaviour.register(rules);
 		
 		if(Element.hasClassName(this, 'startClosed')) {
-			this.toggle();
+			Element.toggle(this);
 		}
 	},
 	
 	toggle: function() {
-		Element.toggle($$('#' + this.id + ' .contentLess')[0]);
-		Element.toggle($$('#' + this.id + ' .contentMore')[0]);
+		var lessDivs = $$('#' + this.id + ' .contentLess');
+		if(lessDivs) Element.toggle(lessDivs[0]);
+		
+		var moreDivs = $$('#' + this.id + ' .contentMore');
+		if(moreDivs) Element.toggle(moreDivs[0]);
 	}
 }
 ToggleField.applyTo('div.toggleField');
\ No newline at end of file