diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml
index e6e2a6ac3..d9a71dc82 100644
--- a/guacamole/src/main/webapp/client.xhtml
+++ b/guacamole/src/main/webapp/client.xhtml
@@ -56,7 +56,7 @@
 
 
         <!-- Display -->
-        <div id="display" class="guac-display guac-loading">
+        <div id="display" class="software-cursor">
             
             <!-- Menu trigger -->
             <div id="menuControl"></div>
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index b3693aebb..abf65ab3d 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -28,7 +28,7 @@ img {
     border: none;
 }
 
-.guac-hide-cursor {
+.software-cursor {
     cursor: url('../images/mouse/dot.gif'),url('../images/mouse/blank.cur'),default;
 }
 
@@ -114,10 +114,8 @@ div.dialog p {
     background: #D44;
 }
 
-div#display {
+div#display * {
     position: relative;
-    width: 640px;
-    height: 480px;
     margin-left: auto;
     margin-right: auto;
 }