diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index a3ef3b2ce..ff37e5dd8 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -746,3 +746,9 @@ a.flip {
 #modalLogout .modal-body {
   overflow:auto;
 }
+#shutdownButton {
+  padding: 3px 10px 5px 10px;
+  color: white;
+}
+#shutdownButton i {
+}
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 1064729cc..8de55f000 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -766,25 +766,23 @@ function getAccountCircleHTML($skin, $user=null) {
 function getStatusBtnHTML($status) {
   $result = '';
   
-  if ( canEdit('System') ) {
-    //$result .= '<li class="nav-item dropdown">'.PHP_EOL;
+  if (canEdit('System')) {
     $result .= '<li id="getStatusBtnHTML">'.PHP_EOL;
     $result .= '<button type="button" class="btn btn-default navbar-btn" id="stateModalBtn">' .$status. '</button>'.PHP_EOL;
     $result .= '</li>'.PHP_EOL;
-    //$result .= '</li>'.PHP_EOL;
 
-    if ( ZM_SYSTEM_SHUTDOWN ) {
-      $result .= '<li class="navbar-text pr-2 align-self-center">'.PHP_EOL;
-      $result .= '<button class="btn btn-outline" data-on-click="getShutdownModal" data-toggle="tooltip" data-placement="top" title="' .translate("Shutdown"). '" ><i class="material-icons md-18">power_settings_new</i></button>'.PHP_EOL;
+    if (ZM_SYSTEM_SHUTDOWN) {
+      $result .= '<li class="pr-2">'.PHP_EOL;
+      $result .= '<button id="shutdownButton" class="btn btn-default navbar-btn" data-on-click="getShutdownModal" data-toggle="tooltip" data-placement="top" title="' .translate('Shutdown'). '"><i class="material-icons md-18">power_settings_new</i></button>'.PHP_EOL;
       $result .= '</li>'.PHP_EOL;
      } 
 
-  } else if ( canView('System') ) {
+  } else if (canView('System')) {
     $result .= '<li id="getStatusBtnHTML" class="navbar-text">'.PHP_EOL;
     $result .= $status.PHP_EOL;
     $result .= '</li>'.PHP_EOL;
   }
-  
+
   return $result;
 }