diff --git a/guacamole/src/main/webapp/app/client/styles/menu.css b/guacamole/src/main/webapp/app/client/styles/menu.css
index c6d18c844..3895d6324 100644
--- a/guacamole/src/main/webapp/app/client/styles/menu.css
+++ b/guacamole/src/main/webapp/app/client/styles/menu.css
@@ -83,19 +83,33 @@
 
 .menu-content .header button.close {
 
-    margin: 0;
+    margin: 0 0.75em;
     padding: 0;
-    min-width: 3em;
-
-    border: none;
+    width: 1.5em;
+    height: 1.5em;
+    min-width: 0;
+    
     box-shadow: none;
-    background: none;
+    -moz-border-radius: 1.5em;
+    -webkit-border-radius: 1.5em;
+    -khtml-border-radius: 1.5em;
+    border-radius: 1.5em;
 
-    background-image: url('images/x.png');
-    background-size: 1em;
+    -moz-background-size: 0.75em;
+    -webkit-background-size: 0.75em;
+    -khtml-background-size: 0.75em;
+    background-size: 0.75em;
+
+    background-image: url('images/x-shadow.png');
     background-repeat: no-repeat;
     background-position: center;
 
+    vertical-align: middle;
+    -ms-flex-align-self: center;
+    -moz-align-self: center;
+    -webkit-align-self: center;
+    align-self: center;
+    
 }
 
 .menu-body {
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 8aa77b9a1..8cb709c36 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -59,7 +59,7 @@
             <!-- Stationary header -->
             <div class="header">
                 <h2>{{client.name}}</h2>
-                <button class="close" ng-click="disconnect()"></button>
+                <button class="close danger" ng-click="disconnect()" title="{{'CLIENT.ACTION_DISCONNECT' | translate}}"></button>
                 <guac-user-menu></guac-user-menu>
             </div>
 
diff --git a/guacamole/src/main/webapp/images/x-shadow.png b/guacamole/src/main/webapp/images/x-shadow.png
new file mode 100644
index 000000000..a274e6155
Binary files /dev/null and b/guacamole/src/main/webapp/images/x-shadow.png differ
diff --git a/guacamole/src/main/webapp/images/x.png b/guacamole/src/main/webapp/images/x.png
deleted file mode 100644
index 5ac7edb2d..000000000
Binary files a/guacamole/src/main/webapp/images/x.png and /dev/null differ