diff --git a/caravel/assets/javascripts/modules/caravel.js b/caravel/assets/javascripts/modules/caravel.js
index 282acfb542..f70c26f194 100644
--- a/caravel/assets/javascripts/modules/caravel.js
+++ b/caravel/assets/javascripts/modules/caravel.js
@@ -273,7 +273,7 @@ var px = (function () {
         }
         $('#timer').removeClass('btn-warning');
         $('#timer').addClass('btn-success');
-        $('span.query').removeClass('disabled');
+        $('span.view_query').removeClass('disabled');
         $('#json').click(function () {
           window.location = data.json_endpoint;
         });
diff --git a/caravel/templates/caravel/explore.html b/caravel/templates/caravel/explore.html
index 7c63f83a7f..d79e75d8c1 100644
--- a/caravel/templates/caravel/explore.html
+++ b/caravel/templates/caravel/explore.html
@@ -50,14 +50,17 @@
               {% endfor %}
             </select>
           </span>
-          <a href="{{ datasource.url }}" class="btn btn-default-outline" data-toggle="tooltip" title="Edit/configure datasource">
-            <i class="fa fa-edit"></i>&nbsp;
-          </a>
+          <span class="label-bordered">
+            <a href="{{ datasource.url }}" data-toggle="tooltip" title="Edit/configure datasource">
+              &nbsp;
+              <i class="fa fa-edit"></i>&nbsp;
+            </a>
+          </span>
           <span title="Visualization Type" data-toggle="tooltip">
             {{ form.get_field("viz_type")(class_="select2-with-images") }}
           </span>
           {% if slice %}
-            <span class="btn btn-default notbtn" title="Slice" data-toggle="tooltip" data-placement="bottom">
+            <span class="label-bordered" title="Slice" data-toggle="tooltip" data-placement="bottom">
                 <span class="favstar" class_name="Slice" obj_id="{{ slice.id }}"></span>
                 {{ slice.slice_name }}
                 <a class="" href="/slicemodelview/edit/{{ slice.id }}" data-toggle="tooltip" title="Edit">