diff --git a/css/main.css b/css/main.css
index 27bc9ddc2..98bb6f59d 100644
--- a/css/main.css
+++ b/css/main.css
@@ -97,7 +97,7 @@ a:hover {
   color: #2980b9;
 }
 
-input {
+.signin input, .setup input  {
   background: #2C3E50 !important;
   -moz-box-shadow:    inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important;
   box-shadow:         inset 0px 0px 3px 0px rgba(0,0,0,0.10) !important;
@@ -105,7 +105,7 @@ input {
   color: #7A8C9E !important;
 }
 
-select {
+.signin select, .setup select {
   background: #2C3E50 !important;
   border: 0 !important;
   color: #7A8C9E !important;
@@ -821,6 +821,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   background: #2C3E50;
   -moz-box-shadow:    0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
   box-shadow:         0px 0px 0px 0px rgba(255,255,255,0.09), inset 0px 0px 2px 0px rgba(0,0,0,0.20);
+  margin-bottom: 20px;
 }
 
 /*-----------------------------------------------------------------*/
diff --git a/views/setup.html b/views/setup.html
index ffae460ce..66d1cca86 100644
--- a/views/setup.html
+++ b/views/setup.html
@@ -1,5 +1,5 @@
 <div ng-controller="SetupController">
-  <div data-alert class="alert-box info radius" ng-show="loading">
+  <div data-alert class="alert-box info" ng-show="loading">
     <i class="size-21 fi-bitcoin-circle icon-rotate spinner"></i>
     Creating wallet...
   </div>
@@ -66,14 +66,14 @@
                 width="50px">
               </div>
             </div>
-            <div class="m20t text-right">
+            <div class="text-right">
               <a ng-show="!isSetupWalletPage" class="back-button m20r" href="/signin">&laquo; Back</a>
               <a ng-show="isSetupWalletPage" class="back-button m20r"
                 ng-click="setupWallet()">&laquo; Back</a>
-              <button ng-show="isSetupWalletPage" type="submit" class="button secondary radius right m0" ng-disabled="setupForm.$invalid || loading">
+              <button ng-show="isSetupWalletPage" type="submit" class="button secondary m0" ng-disabled="setupForm.$invalid || loading">
                 Create {{requiredCopayers}}-of-{{totalCopayers}} wallet
               </button>
-              <a class="button secondary radius right m0" ng-show="!isSetupWalletPage"
+              <a class="button secondary m0" ng-show="!isSetupWalletPage"
                 ng-click="setupWallet()">Next</a>
             </div>
           </div>
diff --git a/views/signin.html b/views/signin.html
index d135eaf0e..7f4b3fcb9 100644
--- a/views/signin.html
+++ b/views/signin.html
@@ -60,7 +60,7 @@
             match="joinPassword" required>
             <div class="text-right">
               <a class="back-button text-primary m20r" ng-click="backWallet()">&laquo; Back</a>
-              <button type="submit" class="button primary radius m0" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
+              <button type="submit" class="button primary m0" ng-disabled="joinForm.$invalid || loading" loading="Joining">Join</button>
             </div>
           </form>
         </div>