diff --git a/resources/static/dialog/css/m.css b/resources/static/dialog/css/m.css
index 8e103feab0d1fab4837aee1c1261fbddabf6a503..08b24fe3105acd15ac6dc8915ee5e52af9e22fd4 100644
--- a/resources/static/dialog/css/m.css
+++ b/resources/static/dialog/css/m.css
@@ -47,7 +47,10 @@
   #favicon {
       display: block;
       width: 100%;
-      position: relative;
+      /* Changed this from relative to static to fix issue #1309 - tooltips
+       * being partially cut off by the site URL bar
+       */
+      position: static;
   }
 
   #favicon {
@@ -91,7 +94,11 @@
       background-color: transparent;
   }
 
-  .error #formWrap, .error #wait, .waiting #formWrap {
+  .waiting #wait, .delay #delay, #error #error {
+      display: block;
+  }
+
+  .waiting #formWrap, .delay #formWrap, .error #formWrap, .delay #wait, .error #wait, .error #delay {
       display: none;
   }
 
@@ -144,7 +151,7 @@
     overflow: visible;
   }
 
-  .submit > #cancel, #signIn .submit > #cancel {
+  .submit #cancel, #signIn .submit #cancel {
     font-size: 18px;
     line-height: 40px;
   }
@@ -157,8 +164,8 @@
     position: static;
   }
 
-  #error .vertical, #wait .vertical {
-      height: 250px;
+  #error .vertical, #delay .vertical, #wait .vertical {
+    height: 250px;
   }
 
   #error .vertical {
diff --git a/resources/static/dialog/css/popup.css b/resources/static/dialog/css/popup.css
index a9bbc5b31101b6d40403396b730f5f5ab25e001b..d3765789e63f85d99d05c94960e50bbb8b3a7c33 100644
--- a/resources/static/dialog/css/popup.css
+++ b/resources/static/dialog/css/popup.css
@@ -93,27 +93,24 @@ section > .contents {
   background-image: url("/i/bg.png");
 }
 
-
 .waiting #wait {
     z-index: 1;
     -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
     opacity: 1;
 }
 
-.error #error, #error.unsupported, #error.cookies_disabled {
-    z-index: 3;
+.delay #delay {
+    z-index: 2;
     -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
     opacity: 1;
 }
 
-.delay #delay {
-    z-index: 2;
+.error #error, #error.unsupported, #error.cookies_disabled {
+    z-index: 3;
     -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
     opacity: 1;
 }
 
-
-
 #error.unsupported {
   padding: 20px 0;
 }
@@ -367,19 +364,10 @@ footer {
     padding: 20px;
 }
 
-.form_section {
-  clear: right;
-}
-
 .inputs {
     line-height: 18px;
 }
 
-/*
-.add {
-    font-size: 80%;
-}
-*/
 .inputs > li:only-child input[type=radio] {
     display: none;
 }