diff --git a/resources/static/css/common.css b/resources/static/css/common.css
index 0a8a061ecd70d2dbf991c3bd1eefdf92af22c4e2..589210345dd1e6a63ba8556b370da5d199ca0d9c 100644
--- a/resources/static/css/common.css
+++ b/resources/static/css/common.css
@@ -205,6 +205,25 @@ button[disabled], .submit_disabled button, .submit_disabled .button,
   opacity: .5;
 }
 
+#cancel, #back {
+  background-color: transparent;
+  color: #549FDC;
+  font-size: 1em;
+  font-weight: normal;
+  text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
+  padding: 0;
+}
+
+
+.submit > a {
+  float: right;
+  margin-right: 15px;
+}
+
+a.secondary[disabled], .submit_disabled a.secondary, .submit_disabled a.secondary:focus, .submit_disabled a.secondary:active {
+  color: #999;
+}
+
 hr {
   height: 1px;
   border: none;
diff --git a/resources/static/dialog/controllers/add_email.js b/resources/static/dialog/controllers/add_email.js
index 9568b8fe91a7b6f747d039d2e852b51eee34c338..1ef8d01fb3622c74f955da684fddbd8db3cd0d9b 100644
--- a/resources/static/dialog/controllers/add_email.js
+++ b/resources/static/dialog/controllers/add_email.js
@@ -37,7 +37,7 @@ BrowserID.Modules.AddEmail = (function() {
 
       self.renderDialog("add_email", options);
 
-      self.bind("#cancelNewEmail", "click", cancelEvent(cancelAddEmail));
+      self.bind("#cancel", "click", cancelEvent(cancelAddEmail));
       Module.sc.start.call(self, options);
     },
     submit: addEmail
diff --git a/resources/static/dialog/controllers/forgot_password.js b/resources/static/dialog/controllers/forgot_password.js
index b2b3a7f121215d29b62b6b9dd9c5d7e603ea9c62..69ae248a5ada141e4146cd1160189944def76f81 100644
--- a/resources/static/dialog/controllers/forgot_password.js
+++ b/resources/static/dialog/controllers/forgot_password.js
@@ -31,7 +31,7 @@ BrowserID.Modules.ForgotPassword = (function() {
         requiredEmail: options.requiredEmail
       });
 
-      self.bind("#cancel_forgot_password", "click", cancelEvent(cancelResetPassword));
+      self.bind("#cancel", "click", cancelEvent(cancelResetPassword));
 
       Module.sc.start.call(self, options);
     },
diff --git a/resources/static/dialog/css/popup.css b/resources/static/dialog/css/popup.css
index a5eb76fda8685eba0169c123ef72184de4097999..ae4e84ebd25fa582aa51b295454ca0874c5ebad5 100644
--- a/resources/static/dialog/css/popup.css
+++ b/resources/static/dialog/css/popup.css
@@ -383,15 +383,6 @@ a.emphasize {
   line-height: 18px;
 }
 
-#back.cancelVerify {
-  background-color: transparent;
-  color: #549FDC;
-  font-size: 1em;
-  font-weight: normal;
-  text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
-  padding: 0;
-}
-
 .submit > button {
     margin: 0 5px 0 0;
 }
diff --git a/resources/static/dialog/views/add_email.ejs b/resources/static/dialog/views/add_email.ejs
index e5c2b4e0028bb5699c310c878206d232472c8614..3c951706d90c0620e26766482d11a019b12ead1a 100644
--- a/resources/static/dialog/views/add_email.ejs
+++ b/resources/static/dialog/views/add_email.ejs
@@ -31,7 +31,7 @@
 
       <div class="submit cf">
           <button id="addNewEmail"><%= gettext('add') %></button>
-          <button id="cancelNewEmail"><%= gettext('cancel') %></button>
+          <a href="#" id="cancel"><%= gettext('cancel') %></a>
       </div>
 
   </div>
diff --git a/resources/static/dialog/views/confirm_email.ejs b/resources/static/dialog/views/confirm_email.ejs
index 04576d703678b77a84f390c527b1fdbbcb19ec5b..39e17c36f0bcd435310a0c3e8bbeb87133573a77 100644
--- a/resources/static/dialog/views/confirm_email.ejs
+++ b/resources/static/dialog/views/confirm_email.ejs
@@ -5,4 +5,4 @@
     <h2><%= gettext('Check your email!') %></h2>
     <p><%= format(gettext('We sent a confirmation email to <strong>%s</strong>'), [email]) %></p>
     <p><%= gettext('To finish signing in just click the verify link we sent to your email address.') %></p><br />
-    <p><%= gettext('If this is a mistake, just ignore the sent email and <a href="#" class="cancelVerify" id="back">use another email address</a>.') %></p>
+    <p><%= gettext('If this is a mistake, just ignore the sent email and <a href="#" id="back">use another email address</a>.') %></p>
diff --git a/resources/static/dialog/views/forgot_password.ejs b/resources/static/dialog/views/forgot_password.ejs
index ef7a7145e064c814db3db44161d57759820d2ebb..68b0d5749adbcdcc0c616e1d4bba5bd848fcb9fb 100644
--- a/resources/static/dialog/views/forgot_password.ejs
+++ b/resources/static/dialog/views/forgot_password.ejs
@@ -25,6 +25,6 @@
 
       <div class="submit cf">
           <button tabindex="1"><%= gettext('Reset Password') %></button>
-          <button id="cancel_forgot_password" tabindex="2"><%= gettext('Cancel') %></button>
+          <a href="#" id="cancel" tabindex="2"><%= gettext('Cancel') %></a>
       </div>
   </div>
diff --git a/resources/static/dialog/views/required_email.ejs b/resources/static/dialog/views/required_email.ejs
index 4254dc123df70da33d94cd7a75c02724b96da4b7..d38ed528176ec38934bbad5b0e80fecfd93d1267 100644
--- a/resources/static/dialog/views/required_email.ejs
+++ b/resources/static/dialog/views/required_email.ejs
@@ -60,7 +60,7 @@
           <% } %>
 
           <% if (secondary_auth) { %>
-            <button id="cancel" tabindex="4"><%= gettext("cancel") %></button>
+            <a href="#" id="cancel" tabindex="4"><%= gettext("cancel") %></a>
           <% } %>
       </div>
   </div>
diff --git a/resources/static/dialog/views/verify_primary_user.ejs b/resources/static/dialog/views/verify_primary_user.ejs
index ed5a10517a1d47e48b0380ac52d2526a78dd3c31..6a7183bcb1e47682a7e14d16feef6f724e20184a 100644
--- a/resources/static/dialog/views/verify_primary_user.ejs
+++ b/resources/static/dialog/views/verify_primary_user.ejs
@@ -41,7 +41,7 @@
 
     <div class="submit cf">
       <button id="verifyWithPrimary"><%= gettext("Verify") %></button>
-      <button id="cancel"><%= gettext("Cancel") %></button>
+      <a href="#" id="cancel"><%= gettext("Cancel") %></a>
     </div>
 
   </div>