diff --git a/resources/static/css/common.css b/resources/static/css/common.css
index f283060f4a2be73cb553ec0252c26164183efc16..bff5e5410f6bc4079e35f61ad76eac09d8def4d2 100644
--- a/resources/static/css/common.css
+++ b/resources/static/css/common.css
@@ -72,7 +72,7 @@ a {
   text-decoration: none;
 }
 
-a:hover, button:hover, input[type=submit]:hover {
+a:hover, button:hover {
   text-decoration: underline;
 }
 
@@ -127,7 +127,8 @@ input[type=checkbox] {
   cursor: pointer;
 }
 
-button, input[type=submit] {
+button,
+.button {
     font-size: 14px;
     height: 28px;
     padding: 0 10px;
@@ -157,20 +158,16 @@ button, input[type=submit] {
 
 button:hover,
 button:focus,
-input[type=submit]:hover,
-input[type=submit]:focus {
+.button:hover,
+.button:focus{
     background-color: #76c2ff;
     background-image: -moz-linear-gradient(center top , #76C2FF 50%, #37A6FF 100%);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(50%, #76C2FF), color-stop(100%, #37A6FF));
 
 }
 
-button[disabled] {
-    opacity: .5;
-}
-
-
-button:active, input[type=submit]:active {
+button:active,
+.button:active {
     background-color: #006EC6;
     border: 1px solid #003E70;
     color: #EEEEEE;
@@ -184,11 +181,18 @@ button:active, input[type=submit]:active {
     background-image: -moz-linear-gradient(center top , #3AA7FF 0%, #006EC6 100%);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #3AA7FF), color-stop(100%, #006EC6));
 }
+
 button::-moz-focus-inner, .button::-moz-focus-inner {
   padding: 0;
   border: 0
 }
 
+button[disabled] {
+    opacity: .5;
+}
+
+
+
 hr {
   height: 1px;
   border: none;
diff --git a/resources/static/css/style.css b/resources/static/css/style.css
index c21302134f902bfa46a05a06f024f0bcb67f5e79..7bfd94681a80f90361b628c859a34a440dd8d735 100644
--- a/resources/static/css/style.css
+++ b/resources/static/css/style.css
@@ -442,45 +442,11 @@ h1 {
   background-color: #37A6FF;
   height: 32px;
   line-height: 27px;
-  display: inline-block;
   padding: 0 16px;
-  vertical-align: middle;
-  border: 1px solid #37A6FF;
   font-size: 16px;
-  font-family: 'Droid Serif', Georgia, serif;
-  color: #fff;
-  text-shadow: -1px -1px 0 #37A6FF;
-  cursor: pointer;
-
-  -webkit-box-shadow: 0 0 0 1px #76C2FF inset;
-     -moz-box-shadow: 0 0 0 1px #76C2FF inset;
-       -o-box-shadow: 0 0 0 1px #76C2FF inset;
-          box-shadow: 0 0 0 1px #76C2FF inset;
-
-  -webkit-border-radius: 5px;
-     -moz-border-radius: 5px;
-       -o-border-radius: 5px;
-          border-radius: 5px;
-
-  background-image: -moz-linear-gradient(#76C2FF 0pt, #37A6FF 100%);
-  background-image: -o-linear-gradient(#76C2FF 0pt, #37A6FF 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76C2FF), color-stop(100%, #37A6FF));
-}
-
-.create:active {
-  background-color: #006EC6;
-  border: 1px solid #003E70;
-  color: #EEEEEE;
-  text-shadow: -1px -1px 0 #006EC6;
-
-  -webkit-box-shadow: 0 0 5px #003763 inset;
-     -moz-box-shadow: 0 0 5px #003763 inset;
-       -o-box-shadow: 0 0 5px #003763 inset;
-          box-shadow: 0 0 5px #003763 inset;
-
-  background-image: -moz-linear-gradient(#3AA7FF 0%, #006EC6 100%);
-  background-image: -o-linear-gradient(#3AA7FF 0%, #006EC6 100%);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #3AA7FF), color-stop(100%, #006EC6));
+  float: none;
+  display: inline-block;
+  vertical-align: middle;
 }
 
 #card {
@@ -632,13 +598,6 @@ h1 {
   float: left;
 }
 
-#signUpForm .create {
-  font-size: 14px;
-  height: 28px;
-  padding: 0 10px;
-  float: right;
-}
-
 #signUpForm .error {
   margin-top: 20px;
   color: red;
@@ -659,7 +618,6 @@ h1 {
 
 #congrats p {
     color: #62615F;
-    /*display: block;*/
     text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
 }
 
diff --git a/resources/views/forgot.ejs b/resources/views/forgot.ejs
index 5824e0c342f2dcbb2cd8ba58281807858de7b029..ab47040c22bad4ee770f85c8de6391f1b7a8ae04 100644
--- a/resources/views/forgot.ejs
+++ b/resources/views/forgot.ejs
@@ -49,7 +49,7 @@
                 <div class="remember cf">
                     <a class="signUpIn" href="/signin">Know your password? Sign in.</a>
                 </div>
-                <input type="submit" class="create" value="Reset Password"/>
+                <button>Reset Password</button>
             </div>
         </form>
     </div>
diff --git a/resources/views/signin.ejs b/resources/views/signin.ejs
index e914e765370573637a7793ba55bd02462d7a05da..360c099daa6627e256102140aba6eba343dda7b4 100644
--- a/resources/views/signin.ejs
+++ b/resources/views/signin.ejs
@@ -42,7 +42,7 @@
                     </div>
                     <label for="memorize">remember me</label>
                 </div-->
-                <input type="submit" class="create" value="Sign In" tabindex="5"/>
+                <button tabindex="5">Sign In</button>
             </div>
         </form>
         <a class="signUpIn space" href="/signup">New to BrowserID? Sign up today.</a>
diff --git a/resources/views/signup.ejs b/resources/views/signup.ejs
index d64061f67c2a5b2e744c3b4cc09621aedb1b27b2..0ded97bf007aab4a1afe670cc49f0aeff47d4ec5 100644
--- a/resources/views/signup.ejs
+++ b/resources/views/signup.ejs
@@ -52,7 +52,7 @@
                 <div class="remember cf">
                     <a class="signUpIn" href="/signin">Existing account? Sign in.</a>
                 </div>
-                <input type="submit" class="create" value="Verify Email"/>
+                <button>Verify Email</button>
             </div>
 
         </form>
diff --git a/resources/views/verifyuser.ejs b/resources/views/verifyuser.ejs
index dbc34d5011f9614afa7edeb5a5e99334a12a309d..91926c6e318ab54a079c8775d836528bc39fc2a5 100644
--- a/resources/views/verifyuser.ejs
+++ b/resources/views/verifyuser.ejs
@@ -43,7 +43,7 @@
       </ul>
 
       <div class="submit cf">
-          <input type="submit" class="create" value="Finish"/>
+          <button>Finish</button>
       </div>
 
     </form>