diff --git a/static/june_2007_style/base.css.tmpl b/static/june_2007_style/base.css.tmpl
index d135799caad..b0ac542efc2 100644
--- a/static/june_2007_style/base.css.tmpl
+++ b/static/june_2007_style/base.css.tmpl
@@ -865,7 +865,7 @@ div.permissionContainer {
     -sprite-group: fugue;
     -sprite-image: fugue/toggle-expand.png;
 }
-.icon-button.toggle-contract {
+.icon-button.toggle {
     -sprite-group: fugue;
     -sprite-image: fugue/toggle.png;
 }
diff --git a/static/june_2007_style/blue/base.css b/static/june_2007_style/blue/base.css
index 16d3898bded..b66e3fd146b 100644
--- a/static/june_2007_style/blue/base.css
+++ b/static/june_2007_style/blue/base.css
@@ -153,8 +153,8 @@ div.permissionContainer{padding-left:20px;}
 .icon-button.tag--plus{background:url(fugue.png) no-repeat 0px -52px;}
 .icon-button.toggle-expand{background:transparent url(../images/fugue/toggle-expand-bw.png) no-repeat;}
 .icon-button.toggle-expand:hover{background:url(fugue.png) no-repeat 0px -78px;}
-.icon-button.toggle-contract{background:transparent url(../images/fugue/toggle-bw.png) no-repeat;}
-.icon-button.toggle-contract:hover{background:url(fugue.png) no-repeat 0px -104px;}
+.icon-button.toggle{background:transparent url(../images/fugue/toggle-bw.png) no-repeat;}
+.icon-button.toggle:hover{background:url(fugue.png) no-repeat 0px -104px;}
 .icon-button.arrow-circle{background:url(fugue.png) no-repeat 0px -130px;}
 .icon-button.chevron{background:url(fugue.png) no-repeat 0px -156px;}
 .icon-button.bug{background:url(fugue.png) no-repeat 0px -182px;}
diff --git a/static/scripts/galaxy.base.js b/static/scripts/galaxy.base.js
index 41a9bd66b98..1c501c8533d 100644
--- a/static/scripts/galaxy.base.js
+++ b/static/scripts/galaxy.base.js
@@ -555,7 +555,7 @@ function init_history_items(historywrapper, noinit, nochanges) {
         });
         
         // Generate 'collapse all' link
-        $("#top-links > a.toggle-contract").click( function() {
+        $("#top-links > a.toggle").click( function() {
             var prefs = $.jStorage.get("history_expand_state");
             if (!prefs) { prefs = {}; }
             $( "div.historyItemBody:visible" ).each( function() {
diff --git a/static/scripts/trackster.js b/static/scripts/trackster.js
index 7053975da8a..86afe0343be 100644
--- a/static/scripts/trackster.js
+++ b/static/scripts/trackster.js
@@ -2391,7 +2391,7 @@ var Track = function(name, view, container, show_header, prefs, data_url, data_q
         this.mode_icon = $("<a/>").attr("href", "javascript:void(0);").attr("title", "Set display mode")
                                   .addClass("icon-button chevron-expand").tipsy( {gravity: 's'} ).appendTo(this.icons_div);
         this.toggle_icon = $("<a/>").attr("href", "javascript:void(0);").attr("title", "Hide/show track content")
-                                    .addClass("icon-button toggle-contract").tipsy( {gravity: 's'} )
+                                    .addClass("icon-button toggle").tipsy( {gravity: 's'} )
                                     .appendTo(this.icons_div);
         this.settings_icon = $("<a/>").attr("href", "javascript:void(0);").attr("title", "Edit settings")
                                       .addClass("icon-button settings-icon").tipsy( {gravity: 's'} )
@@ -2439,11 +2439,11 @@ var Track = function(name, view, container, show_header, prefs, data_url, data_q
         // Toggle icon hides or shows the track content.
         this.toggle_icon.click( function() {
             if ( track.content_visible ) {
-                track.toggle_icon.addClass("toggle-expand").removeClass("toggle-contract");
+                track.toggle_icon.addClass("toggle-expand").removeClass("toggle");
                 track.hide_contents();
                 track.content_visible = false;
             } else {
-                track.toggle_icon.addClass("toggle-contract").removeClass("toggle-expand");
+                track.toggle_icon.addClass("toggle").removeClass("toggle-expand");
                 track.content_visible = true;
                 track.show_contents();
             }
diff --git a/templates/embed_base.mako b/templates/embed_base.mako
index b55ebb13b93..f5af1de33b3 100644
--- a/templates/embed_base.mako
+++ b/templates/embed_base.mako
@@ -44,7 +44,7 @@
     <div style="float: left">
         <a class="display_in_embed icon-button toggle-expand tooltip" item_id="${trans.security.encode_id( item.id )}" item_class="$item.__class__.__name__" href="${display_href}"
             title="Show ${item_display_name} content"></a>
-        <a class="toggle-contract icon-button tooltip" href="${display_href}" title="Hide ${item_display_name} content"></a>
+        <a class="toggle icon-button tooltip" href="${display_href}" title="Hide ${item_display_name} content"></a>
     </div>
     <div style="float: right;">
         ${self.render_item_links( item )}
diff --git a/templates/page/display.mako b/templates/page/display.mako
index b0cd25eee5b..93e639a54b1 100644
--- a/templates/page/display.mako
+++ b/templates/page/display.mako
@@ -26,7 +26,7 @@
                                 container.find(".summary-content").hide("fast");
                                 container.find(".item-content").html(item_content).show("fast");
                                 container.find(".toggle-expand").hide();
-                                container.find(".toggle-contract").show();
+                                container.find(".toggle").show();
 
                                 // Init needed for history items.
                                 init_history_items( container.find("div.historyItemWrapper"), "noinit", "nochanges" ); 
@@ -43,7 +43,7 @@
                         container.find(".summary-content").hide("fast");
                         container.find(".item-content").show("fast");
                         container.find(".toggle-expand").hide();
-                        container.find(".toggle-contract").show();
+                        container.find(".toggle").show();
                     }
                 };
             
@@ -51,7 +51,7 @@
                 var hide_embedded_item = function() {
                     container.find(".item-content").hide("fast");
                     container.find(".summary-content").show("fast");
-                    container.find(".toggle-contract").hide();
+                    container.find(".toggle").hide();
                     container.find(".toggle-expand").show();
                 };
             
@@ -63,7 +63,7 @@
                 });
             
                 // Setup toggle contract.
-                var toggle_contract = $(this).find('.toggle-contract');
+                var toggle_contract = $(this).find('.toggle');
                 toggle_contract.click( function() {
                     hide_embedded_item();
                     return false;
@@ -89,7 +89,7 @@
     ${parent.stylesheets()}
     ${h.css( "base", "history", "autocomplete_tagging" )}
     <style type="text/css">
-        .toggle-contract { display: none; }
+        .toggle { display: none; }
         .embedded-item h4 {
             margin: 0px;
         }
diff --git a/templates/root/history.mako b/templates/root/history.mako
index 63bf2bdc30f..fde1d565a58 100644
--- a/templates/root/history.mako
+++ b/templates/root/history.mako
@@ -432,7 +432,7 @@ div.form-row {
 <div id="top-links" class="historyLinks">
     
     <a title="${_('refresh')}" class="icon-button arrow-circle tooltip" href="${h.url_for('history', show_deleted=show_deleted)}"></a>
-    <a title='${_('collapse all')}' class='icon-button toggle-contract tooltip' href='#' style="display: none"></a>
+    <a title='${_('collapse all')}' class='icon-button toggle tooltip' href='#' style="display: none"></a>
     
     %if trans.get_user():
     <div style="width: 40px; float: right; white-space: nowrap;">