diff --git a/guacamole/src/main/webapp/app/client/styles/client.css b/guacamole/src/main/webapp/app/client/styles/client.css
index c110948e8..17c7bf85a 100644
--- a/guacamole/src/main/webapp/app/client/styles/client.css
+++ b/guacamole/src/main/webapp/app/client/styles/client.css
@@ -116,6 +116,10 @@ body.client {
 
 }
 
+.client .menu .header h2 {
+    text-transform: none;
+}
+
 .client .user-menu .options li a.disconnect {
     background-repeat: no-repeat;
     background-size: 1em;
diff --git a/guacamole/src/main/webapp/app/index/styles/headers.css b/guacamole/src/main/webapp/app/index/styles/headers.css
index a99364a60..2e813f42f 100644
--- a/guacamole/src/main/webapp/app/index/styles/headers.css
+++ b/guacamole/src/main/webapp/app/index/styles/headers.css
@@ -32,7 +32,7 @@ h2 {
     font-size: 1.25em;
     font-weight: bold;
     text-transform: uppercase;
-    padding: 0.75em 0.5em;
+    padding: 0.5em;
     margin: 0;
 }
 
@@ -90,7 +90,7 @@ h2 {
 
 .header .filter {
     margin: 0;
-    padding: 0.75em 0.5em;
+    padding: 0.5em;
 }
 
 .header .filter input {
diff --git a/guacamole/src/main/webapp/app/manage/styles/attributes.css b/guacamole/src/main/webapp/app/manage/styles/attributes.css
index 70871b03c..136ec5dee 100644
--- a/guacamole/src/main/webapp/app/manage/styles/attributes.css
+++ b/guacamole/src/main/webapp/app/manage/styles/attributes.css
@@ -49,7 +49,7 @@
     font-size: 1.25em;
     font-weight: bold;
     text-transform: uppercase;
-    padding: 0.75em 0.5em;
+    padding: 0.5em;
     margin: 1em 0;
 
     border-bottom: 1px solid rgba(0, 0, 0, 0.125);
diff --git a/guacamole/src/main/webapp/app/navigation/styles/menu.css b/guacamole/src/main/webapp/app/navigation/styles/menu.css
index c40215871..4a7c13469 100644
--- a/guacamole/src/main/webapp/app/navigation/styles/menu.css
+++ b/guacamole/src/main/webapp/app/navigation/styles/menu.css
@@ -65,8 +65,8 @@
 
     cursor: default;
     margin: 0;
-    min-width: 2in;
     padding: 0.5em;
+    padding-right: 2em;
 
     -ms-flex: 0 0 auto;
     -moz-box-flex: 0;
@@ -98,7 +98,8 @@
     position: absolute;
     top: 100%;
     right: 0;
-    left: -1px;
+    min-width: 100%;
+    white-space: nowrap;
 
     background: #EEE;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.125);
diff --git a/guacamole/src/main/webapp/app/navigation/styles/user-menu.css b/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
index 7d679edc3..9acecc871 100644
--- a/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
+++ b/guacamole/src/main/webapp/app/navigation/styles/user-menu.css
@@ -48,9 +48,8 @@
 
 .user-menu .menu-dropdown .menu-title {
 
-    font-size: 1.25em;
     font-weight: bold;
-    padding: 0.5em 2em;
+    padding-left: 2em;
 
     background-repeat: no-repeat;
     background-size: 1em;