diff --git a/src/UI/Content/theme.less b/src/UI/Content/theme.less
index 68581bead..2ce038698 100644
--- a/src/UI/Content/theme.less
+++ b/src/UI/Content/theme.less
@@ -219,26 +219,3 @@ body {
   height: 55px;
   opacity: 0;
 }
-
-.lifecycle-controls {
-  font-size: 20px;
-
-  i {
-    cursor: pointer;
-  }
-
-  .drone-button {
-    height: .8em;
-    margin-left: -8px;
-
-    &:hover {
-      .icon-stack-base:before {
-        .icon(@sign-blank)
-      }
-
-      .icon-nd-restart:before {
-        color: white;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/src/UI/System/SystemLayoutTemplate.html b/src/UI/System/SystemLayoutTemplate.html
index 2d3e45480..3e5a10b8e 100644
--- a/src/UI/System/SystemLayoutTemplate.html
+++ b/src/UI/System/SystemLayoutTemplate.html
@@ -3,17 +3,16 @@
     <li><a href="#logs" class="x-logs-tab no-router">Logs</a></li>
     <li><a href="#updates" class="x-updates-tab no-router">Updates</a></li>
     <li class="lifecycle-controls pull-right">
-        <span class="icon-stack drone-button x-shutdown">
-          <i class="icon-check-empty icon-stack-base"></i>
-          <i class="icon-nd-shutdown"></i>
-        </span>
-
-        {{#if_windows}}
-            <span class="icon-stack drone-button x-restart">
-              <i class="icon-check-empty icon-stack-base"></i>
-              <i class="icon-nd-restart"></i>
-            </span>
-        {{/if_windows}}
+        <div class="btn-group">
+            <button class="btn btn-icon-only x-shutdown" title="Shutdown" data-container="body">
+                <i class="icon-nd-shutdown"></i>
+            </button>
+            {{#if_windows}}
+            <button class="btn btn-icon-only x-restart" title="Restart" data-container="body">
+                <i class="icon-nd-restart"></i>
+            </button>
+            {{/if_windows}}
+        </div>
     </li>
 </ul>