diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index 31139111d..cc6e6f5b8 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -702,13 +702,13 @@ GuacUI.Client.attach = function(guac) {
 
             // Connecting
             case 1:
-                GuacUI.Client.showStatus("Connecting", "Connecting to server...");
+                GuacUI.Client.showStatus("Connecting", "Connecting to Guacamole...");
                 GuacUI.Client.titlePrefix = "[Connecting...]";
                 break;
 
             // Connected + waiting
             case 2:
-                GuacUI.Client.showStatus("Waiting", "Connected. Waiting for first frame...");
+                GuacUI.Client.showStatus("Connecting", "Connected to Guacamole. Waiting for response...");
                 GuacUI.Client.titlePrefix = "[Waiting...]";
                 break;
 
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index e2ff460e1..029fa01a8 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -65,27 +65,6 @@ div.dialogMiddle {
     vertical-align: middle;
 }
 
-div.dialog {
-    padding: 1em;
-
-    max-width: 75%;
-    text-align: left;
-
-    display: inline-block;
-}
-
-div.dialog h1 {
-    margin: 0;
-    margin-bottom: 0.25em;
-    text-align: center;
-}
-
-div.dialog div.buttons {
-    margin: 0;
-    margin-top: 0.5em;
-    text-align: center;
-}
-
 button {
 
     border-style: solid;
@@ -257,29 +236,35 @@ div#viewportClone {
 }
 
 @keyframes show-dialog {
-    0%   {transform: scale(0.5); }
+    0%   {transform: scale(0.75); }
     100% {transform: scale(1); }
 }
 
 @-webkit-keyframes show-dialog {
-    0%   {-webkit-transform: scale(0.5); }
+    0%   {-webkit-transform: scale(0.75); }
     100% {-webkit-transform: scale(1); }
 }
 
 .dialog {
 
     animation-name: show-dialog;
+    animation-timing-function: linear;
     animation-duration: 0.125s;
     -webkit-animation-name: show-dialog;
+    -webkit-animation-timing-function: linear;
     -webkit-animation-duration: 0.125s;
     
+    max-width: 75%;
     max-height: none;
     width: 4in;
-    font-size: 0.75em;
     -moz-border-radius: 0.2em;
     -webkit-border-radius: 0.2em;
     -khtml-border-radius: 0.2em;
     border-radius: 0.2em;
+
+    padding: 0.5em;
+    text-align: left;
+    
 }
 
 .guac-error .dialog {
@@ -294,6 +279,11 @@ div#viewportClone {
     margin-bottom: 0.5em;
 }
 
+.dialog .status {
+    padding: 0.5em;
+    font-size: 0.8em;
+}
+
 p.hint {
     
     border: 0.25em solid rgba(255, 255, 255, 0.25);