diff --git a/css/collapsible-div.css b/css/collapsible-div.css
index 73b0bdd..24e9fe9 100644
--- a/css/collapsible-div.css
+++ b/css/collapsible-div.css
@@ -1,26 +1,57 @@
-
 .views-collapsible-container .views-toggle {
-  float: left;
-  width: 21px;
-  height: 21px;
+  border-bottom-color: transparent;
+  border-left-color: transparent;
+  border-right-color: transparent;
+  border-style: solid;
+  border-width: 5px 5px 0;
   cursor: pointer;
-  background-position: 7px 5px;
-  background-repeat: no-repeat;
-  background-image: url(../images/collapsible-expanded.png);
+  display: inline-block;
+  float: left;
+  height: 0;
+  margin-left: 6px;
+  margin-right: 3px;
+  margin-top: 14px;
+  width: 0;
 }
-
-.views-collapsible-container .views-collapsible-handle {
-  display: none;
+[dir="rtl"] .views-collapsible-container .views-toggle {
+  float: right;
+  margin-left: 3px;
+  margin-right: 6px;
 }
-
-html.js .views-collapsible-container .views-collapsible-handle {
-  display: block;
+.views-collapsible-container .views-toggle.views-toggle-collapsed {
+  border-left: 4px solid;
+  border-top-color: transparent;
+  border-width: 5px 0 5px 5px;
+  margin-left: 9px;
+  margin-right: 5px;
+  margin-top: 12px;
+}
+[dir="rtl"] .views-collapsible-container .views-toggle.views-toggle-collapsed {
+  border-left: 0;
+  border-right: 4px solid;
+  border-left-color: transparent;
+  margin-left: 6px;
+  margin-right: 9px;
+}
+.views-collapsible-container .views-toggle.views-toggle-collapsed + .views-collapsible-handle {
+  border-width: 1px;
 }
-
 .views-collapsible-container .views-collapsible-handle {
+  border-color: #f3f3f3;
+  border-style: solid;
+  border-width: 1px 1px 0;
+  display: none;
+  font-size: 13px;
+  font-weight: normal;
+  margin: 0;
+  padding: 6px 3px;
+}
+.views-collapsible-container .views-collapsible-handle:hover {
   cursor: pointer;
 }
-
-.views-collapsible-container .views-toggle-collapsed {
-  background-image: url(../images/collapsible-collapsed.png);
+.js .views-collapsible-container .views-collapsible-handle {
+  display: block;
+}
+.js .views-collapsible-container .views-ui-display-tab-bucket:first-child {
+  border-top: none;
 }
diff --git a/css/views-admin.ctools-rtl.css b/css/views-admin.ctools-rtl.css
index 12b1778..65317a5 100644
--- a/css/views-admin.ctools-rtl.css
+++ b/css/views-admin.ctools-rtl.css
@@ -30,33 +30,10 @@
 
 /* @end */
 
-/* @group Collapsible */
+/* @group Show filters */
 
-.views-toggle {
+.ctools-export-ui-row label {
   float: right;
-  margin-left: 2px;
-  margin-right: 0;
-}
-
-.views-toggle.views-toggle-collapsed {
-  border-left: 0;
-  border-right: 4px solid;
-  border-left-color: transparent;
-  margin-left: 5px;
-  margin-right: 2px;
-}
-
-.views-export-ui-row label {
-  float: right;
-}
-
-.views-display-column > .views-toggle {
-  margin-left: 3px;
-  margin-right: 6px;
-}
-.views-display-column > .views-toggle.views-toggle-collapsed {
-  margin-left: 5px;
-  margin-right: 9px;
 }
 
 /* @end */
diff --git a/css/views-admin.ctools.css b/css/views-admin.ctools.css
index bee801b..500e96f 100644
--- a/css/views-admin.ctools.css
+++ b/css/views-admin.ctools.css
@@ -119,69 +119,17 @@
 
 /* @end */
 
-/* @group Collapsible */
-
-.views-toggle {
-  border-top-color: transparent;
-  border-bottom-color: transparent;
-  border-left-color: transparent;
-  border-right-color: transparent;
-  border-style: solid;
-  border-width: 5px 5px 0;
-  display: inline-block;
-  float: left;
-  height: 0;
-  margin-right: 2px;
-  width: 0;
-}
-
-.views-toggle.views-toggle-collapsed {
-  border-bottom-color: transparent;
-  border-left:  transparent;
-  border-right-color: transparent;
-  border-top-color: transparent;
-  margin-left: 2px;
-  margin-right: 5px;
-  margin-top: -2px;
-}
-
-.views-toggle:hover,
-.views-collapsible-handle:hover {
-  cursor: pointer;
-}
-
-.views-display-column > .views-toggle {
-  margin-left: 6px;
-  margin-right: 3px;
-  margin-top: 5px;
-}
-.views-display-column > .views-toggle.views-toggle-collapsed {
-  margin-left: 9px;
-  margin-right: 5px;
-  margin-top: 3px;
-}
+/* @group Show filters */
 
-.views-display-column > .views-collapsible-handle {
-  border-color: #F3F3F3;
-  border-style: solid;
-  border-width: 1px 1px 0;
-  font-size: 13px;
-  font-weight: normal;
-  margin: 0;
-  padding: 6px 3px;
-}
-
-.views-display-column > .views-toggle.views-toggle-collapsed + .views-collapsible-handle {
-  border-width: 1px;
-}
-
-.views-display-column > .views-collapsible-content > .views-ui-display-tab-bucket:first-child {
-  border-top: medium none;
+.ctools-export-ui-row {
+  margin-bottom: 0;
+  padding-top: 0;
 }
 
-.views-display-column h2.views-collapsible-handle {
-  display: inline;
-  clear: both;
+.ctools-export-ui-row label {
+  display: block;
+  float: left;
+  width: 55px;
 }
 
 /* @end */
diff --git a/images/collapsible-collapsed.png b/images/collapsible-collapsed.png
deleted file mode 100644
index 95a214a..0000000
Binary files a/images/collapsible-collapsed.png and /dev/null differ
diff --git a/images/collapsible-expanded.png b/images/collapsible-expanded.png
deleted file mode 100644
index 46f39ec..0000000
Binary files a/images/collapsible-expanded.png and /dev/null differ
diff --git a/includes/admin.inc b/includes/admin.inc
index cfed1f0..5065398 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -1048,14 +1048,13 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
         'class' => array(
           'views-display-settings',
           'box-margin',
-          'views-collapsible-container',
         ),
       ),
       '#id' => 'edit-display-settings',
     );
     $display_title = views_ui_get_display_label($view, $display_id, FALSE);
     // Add a handle for the views collapsible-div. The handle is the title of the display
-    $form['displays']['settings']['tab_title']['#markup'] = '<h2 id="edit-display-settings-title" class="views-collapsible-handle">' . t('@display_title details', array('@display_title' => ucwords($display_title))) . '</h2>';
+    $form['displays']['settings']['tab_title']['#markup'] = '<h2 id="edit-display-settings-title">' . t('@display_title details', array('@display_title' => ucwords($display_title))) . '</h2>';
     // Add a text that the display is disabled.
     if (!empty($view->display[$display_id]->handler)) {
       $enabled = $view->display[$display_id]->handler->getOption('enabled');
diff --git a/js/collapsible-div.js b/js/collapsible-div.js
index 55801ae..ffc55cd 100644
--- a/js/collapsible-div.js
+++ b/js/collapsible-div.js
@@ -51,7 +51,7 @@
 
     if (content.length) {
       // Create the toggle item and place it in front of the toggle.
-      var toggle = $('<span class="views-toggle"></span>');
+      var toggle = $('<a class="views-toggle"></a>');
       handle.before(toggle);
 
       // If we should start collapsed, do so: