diff --git a/public/static/css/map_editor.css b/public/static/css/map_editor.css
index 1b46865..26cd4bf 100644
--- a/public/static/css/map_editor.css
+++ b/public/static/css/map_editor.css
@@ -55,6 +55,12 @@
     visibility: hidden;
 }
 
+#overlayControl {
+    bottom: 20px;
+    right: 10px;
+    z-index: 3;
+}
+
 #deleteButton {
     display: none;
 }
diff --git a/public/static/js/map_editor.js b/public/static/js/map_editor.js
index b4e5308..2831aa5 100644
--- a/public/static/js/map_editor.js
+++ b/public/static/js/map_editor.js
@@ -403,7 +403,7 @@
 
             LMapWrapper.loadMarkers(places);
 
-            document.getElementById('streetViewCoverSelector').disabled = true;
+            document.getElementById('streetViewCoverSelector').style.display = 'none';
         },
 
         hide: function () {
@@ -536,7 +536,7 @@
 
             GMapWrapper.loadMarkers(places);
 
-            document.getElementById('streetViewCoverSelector').disabled = false;
+            document.getElementById('streetViewCoverSelector').style.display = 'block'
         },
 
         hide: function () {
diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index 1510b6d..4b6da75 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -11,18 +11,13 @@
 
 @extends(templates/layout_full)
 
-@section(subheader) 
+@section(subheader)
            <span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
         --><span class="inline hideOnMobile" id="mapSelection">
                 <button id="mapSelector">
                     <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/map.svg?rev=<?= REVISION ?>" alt="Map Selector" />
                 </button>
            </span><!--
-        --><span class="inline hideOnMobile" id="mapSelection">
-        <button id="streetViewCoverSelector">
-                    <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/street-view-cover.svg?rev=<?= REVISION ?>" alt="Street View Conver" />
-                </button>
-           </span><!--
         --><span class="inline hideOnMobile">
                <input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
                <button id="jumpButton" disabled >Jump</button>
@@ -71,6 +66,16 @@
     <div id="map" class="map">
         <div id="lmap" class="map"></div>
         <div id="gmap" class="map"></div>
+        <div id="overlayControl" class="circleControl">
+            <div id="streetViewCoverSelector" class="controlItem" title="Toggle Street View Cover">
+                <div>
+                    <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="controlBackground" />
+                </div>
+                <div>
+                    <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/street-view-cover.svg?rev=<?= REVISION ?>" alt="Street View Cover" class="controlIcon" />
+                </div>
+            </div>
+        </div>
     </div>
     <div id="panorama"></div>
     <div id="noPano">