diff --git a/public/views/create.html b/public/views/create.html
index 4f68ebf59..cc04dddec 100644
--- a/public/views/create.html
+++ b/public/views/create.html
@@ -1,5 +1,5 @@
-<div 
-  class="topbar-container" 
+<div
+  class="topbar-container"
   ng-include="'views/includes/topbar.html'"
   ng-init="titleSection='Create new wallet';  goBackToState = 'add'; noColor = true">
 </div>
@@ -65,8 +65,8 @@
         <div class="m10t oh" ng-init="hideAdv=true">
           <a class="button outline light-gray expand tiny" ng-click="hideAdv=!hideAdv">
             <i class="fi-widget m3r"></i>
-            <span translate ng-hide="!hideAdv">Show</span> 
-            <span translate ng-hide="hideAdv">Hide</span> 
+            <span translate ng-hide="!hideAdv">Show</span>
+            <span translate ng-hide="hideAdv">Hide</span>
             <span translate>Advanced options</span>
             <i ng-if="hideAdv" class="icon-arrow-down4"></i>
             <i ng-if="!hideAdv" class="icon-arrow-up4"></i>
@@ -81,16 +81,16 @@
             <label for="ext-master" class="m10t">
               <span translate>Master extended private key</span>
               <small translate>If not given, a random key will be generated</small>
-              <input id="ext-master" 
-              type="text" 
-              placeholder="BIP32 master extended private key" 
+              <input id="ext-master"
+              type="text"
+              placeholder="BIP32 master extended private key"
               name="privateKey" ng-model="privateKey">
           </div>
         </div>
 
 
-        <button type="submit" class="button black expand radius m0" ng-disabled="setupForm.$invalid">
-          <span translate>Create</span> 
+        <button type="submit" class="button round black expand m0" ng-disabled="setupForm.$invalid">
+          <span translate>Create</span>
           {{requiredCopayers}}-<span translate>of</span>-{{totalCopayers}} <span translate>wallet</span>
         </button>
       </div>
diff --git a/public/views/import.html b/public/views/import.html
index 6692cbb7f..7ea436bce 100644
--- a/public/views/import.html
+++ b/public/views/import.html
@@ -1,5 +1,5 @@
-<div 
-  class="topbar-container" 
+<div
+  class="topbar-container"
   ng-include="'views/includes/topbar.html'"
   ng-init="titleSection='Import wallet';  goBackToState = 'add'; noColor = true">
 </div>
@@ -49,7 +49,7 @@
               <input type="password" class="form-control" placeholder="{{'Your backup password'|translate}}"
               name="password" ng-model="import.password">
             </div>
-            <button translate type="submit" class="button radius expand black" 
+            <button translate type="submit" class="button round expand black"
               ng-disabled="importForm.$invalid || !import.password">
               Import backup
             </button>
@@ -57,12 +57,12 @@
 
     <div class="text-center text-gray p20v" ng-click="$root.go('importLegacy')">
       <p class="text-gray m5b size-14" translate> Have a Backup from Copay v0.9?</p>
-      <button class=" outline dark-gray tiny" translate> Import here
+      <button class=" outline dark-gray tiny round" translate> Import here
         <i class="icon-arrow-right3 size-14"></i>
       </button>
 
 
-   </div> 
+   </div>
 
       </div>
     </div>
diff --git a/public/views/importLegacy.html b/public/views/importLegacy.html
index c4410aa78..cc0476816 100644
--- a/public/views/importLegacy.html
+++ b/public/views/importLegacy.html
@@ -1,5 +1,5 @@
-<div 
-  class="topbar-container" 
+<div
+  class="topbar-container"
   ng-include="'views/includes/topbar.html'"
   ng-init="titleSection='Import legacy wallet'; goBackToState = 'import'; noColor = true">
 </div>
@@ -12,7 +12,7 @@
         <div ng-show="importLegacy.importing">
           <h1 class="m20b animated infinite flash" translate>Importing...</h1>
           <ul>
-            <li ng-repeat="m in importLegacy.messages"> 
+            <li ng-repeat="m in importLegacy.messages">
             <span ng-style="{'opacity':m.opacity}">{{m.message|translate}}</span>
           </ul>
         </div>
@@ -49,10 +49,10 @@
             name="server" ng-model="importLegacy.server" required>
           </label>
 
-          <button translate type="submit" 
-            class="button black radius expand m0" 
+          <button translate type="submit"
+            class="button black round expand m0"
             ng-disabled="deviceForm.$invalid">
-            Import 
+            Import
           </button>
         </form>
 
@@ -65,15 +65,14 @@
         </form>
 
     <div class="text-center p20v">
-      <a class="m20t  tiny button outline light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
+      <a class="m20t tiny button outline round light-gray " ng-click="$root.openExternalLink('https://github.com/bitpay/copay/releases/tag/v0.10.0')" translate>
          Learn more about Wallet Migration
       </a>
     </div>
- 
+
 
       </div>
-    
+
 
     </div>
 </div>
-
diff --git a/public/views/join.html b/public/views/join.html
index a472af711..9fd8e2b62 100644
--- a/public/views/join.html
+++ b/public/views/join.html
@@ -1,5 +1,5 @@
-<div 
-  class="topbar-container" 
+<div
+  class="topbar-container"
   ng-include="'views/includes/topbar.html'"
   ng-init="titleSection='Join shared wallet'; goBackToState = 'add'; noColor = true">
 </div>
@@ -83,7 +83,7 @@
               </label>
             </div>
           </div>
-          <button translate type="submit" class="button expand black m0 radius" ng-disabled="joinForm.$invalid">Join</button>
+          <button translate type="submit" class="button expand black m0 round" ng-disabled="joinForm.$invalid">Join</button>
       </form>
     </div>
   </div>
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html
index 1d5d40366..78ef455eb 100644
--- a/public/views/modals/tx-details.html
+++ b/public/views/modals/tx-details.html
@@ -82,7 +82,7 @@
 
   <div ng-show="btx.txid" class="tx-details-blockchain">
     <div class="text-center m20t">
-      <button class="button outline dark-gray tiny" ng-click="$root.openExternalLink('https://' +
+      <button class="button outline round dark-gray tiny" ng-click="$root.openExternalLink('https://' +
         (getShortNetworkName() == 'test' ? 'test-' : '') + 'insight.bitpay.com/tx/' + btx.txid)">
         <span class="text-gray" translate>See it on the blockchain</span>
       </button>
diff --git a/public/views/modals/txp-details.html b/public/views/modals/txp-details.html
index 774e8834c..fe0590f39 100644
--- a/public/views/modals/txp-details.html
+++ b/public/views/modals/txp-details.html
@@ -1,7 +1,7 @@
 <nav class="tab-bar">
   <section class="left-small">
     <a ng-click="cancel()">
-      <i class="icon-arrow-left3 icon-back"></i> 
+      <i class="icon-arrow-left3 icon-back"></i>
       <span class="text-back" translate>Back</span>
     </a>
   </section>
@@ -92,14 +92,14 @@
 
   <div class="row m20t" ng-if="tx.pendingForUs">
     <div class="large-5 medium-5 small-6 columns">
-      <button class="button outline dark-gray m0 expand" ng-click="reject(tx);"
+      <button class="button outline round dark-gray m0 expand" ng-click="reject(tx);"
         ng-disabled="loading">
         <i class="fi-x"></i>
         <span translate>Reject</span>
       </button>
     </div>
     <div class="large-5 medium-5 small-6 columns text-right">
-      <button class="button primary m0 expand" ng-click="sign(tx)"
+      <button class="button primary round m0 expand" ng-click="sign(tx)"
         ng-style="{'background-color':color}"
         ng-disabled="loading">
         <i class="fi-check"></i>
@@ -116,7 +116,7 @@
     <div class="m10t"
       ng-show="!loading && tx.status!='broadcasted' && tx.status=='accepted' && tx.status!='rejected'">
       <div translate>But not broadcasted. Try to send manually</div>
-      <button class="primary"
+      <button class="primary round"
         ng-click="broadcast(tx)"
         ng-disabled="loading"> <i class="fi-upload-cloud"></i>
         <span translate>Broadcast Transaction</span>
@@ -136,7 +136,7 @@
     <div class="text-gray size-12 text-center m20b" show="tx.couldRemove" translate>
       * Only transactions created by yourself with no peer signatures can be removed
     </div>
-    <button class="tiny expand outline dark-gray" ng-click="remove(tx)"
+    <button class="tiny expand round outline dark-gray" ng-click="remove(tx)"
       ng-disabled="loading" ng-show="tx.couldRemove">
       <i class="fi-trash size-14 m5r"></i>
       <span translate>Remove transaction</span>
diff --git a/public/views/walletHome.html b/public/views/walletHome.html
index 5adb08583..97a28d58d 100644
--- a/public/views/walletHome.html
+++ b/public/views/walletHome.html
@@ -1,5 +1,5 @@
 
-<div class="topbar-container" 
+<div class="topbar-container"
   ng-include="'views/includes/topbar.html'"
   ng-init="showCamera = true">
 </div>
@@ -12,7 +12,7 @@
     <button class="button black expand" ng-click="$root.go('add')" translate>Create</button>
 
     <div class="text-center text-gray p20v" ng-click="$root.go('preferences')">
-      <button class=" outline dark-gray tiny" translate> Preferences </button>
+      <button class=" outline round dark-gray tiny" translate> Preferences </button>
     </div>
   </div>
 
@@ -105,7 +105,7 @@
             ng-style="{'background-color':index.backgroundColor}">{{index.walletName | limitTo: 1}}
           </div>
           <div class="right">
-            <a ng-click="$root.go('preferences')" class="button outline light-gray tiny m0">
+            <a ng-click="$root.go('preferences')" class="button outline round light-gray tiny preferences-icon m0">
               <i class="fi-widget size-18 vm"></i>
               <span class="show-for-medium-up" translate>Preferences</span>
             </a>
@@ -143,7 +143,7 @@
           This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
         </div>
         <div class="text-center m10t ">
-          <span class="button outline dark-gray tiny"
+          <span class="button outline round dark-gray tiny"
             ng-click="index.recreate()">
             <span translate>Recreate</span>
           </span>
@@ -195,13 +195,13 @@
         </div>
 
         <div class="small-6 columns m20t">
-          <span class="button expand outline dark-gray tiny"
+          <span class="button expand outline round dark-gray tiny"
             ng-click="home.skipBackup = true">
             <span translate>SKIP BACKUP</span>
           </span>
         </div>
         <div class="small-6 columns m20t">
-          <span class="button black expand radius tiny"
+          <span class="button black expand round tiny"
             ng-click="$root.go('backup')" ng-style="{'background-color':index.backgroundColor}" >
             <span translate>Backup now</span>
           </span>
@@ -236,7 +236,7 @@
             </div>
 
             <div class="m10t text-center" ng-show="index.isCordova">
-              <span class="button outline dark-gray tiny"
+              <span class="button outline dark-gray tiny round"
                 ng-click="home.shareAddress(home.addr)">
                 <i class="fi-share"></i>
                 <span translate>Share address</span>
@@ -249,7 +249,7 @@
         </div>
         <div class="row m20t">
           <div class="large-12 columns">
-            <button class="button black expand radius" ng-click="home.setNewAddress()"
+            <button class="button black expand round" ng-click="home.setNewAddress()"
               ng-style="{'background-color':index.backgroundColor}" ng-disabled="home.blockUx || index.isOffline ||home.generatingAddress" translate>
               Generate new address
             </button>
@@ -378,10 +378,10 @@
 
             <div class="row" ng-show="!home.onGoingProcess">
               <div class="large-6 medium-6 small-6 columns" ng-show="!home.blockUx && (home._paypro || home.lockAddress)">
-                <a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray" translate>Cancel</a>
+                <a ng-click="home.resetForm(sendForm)" class="button expand outline dark-gray round" translate>Cancel</a>
               </div>
               <div class="columns" ng-class="{'small-6 medium-6 large-6':(home._paypro || home.lockAddress)}">
-                <button type="submit" class="button black radius expand" ng-disabled="sendForm.$invalid || home.blockUx ||  index.isOffline"
+                <button type="submit" class="button black round expand" ng-disabled="sendForm.$invalid || home.blockUx ||  index.isOffline"
                   ng-style="{'background-color':index.backgroundColor}"  translate>
                   Send
                 </button>
@@ -449,7 +449,7 @@
           </div>
         </div>
         <div class="m20t columns text-center" ng-show="index.txHistoryPaging || index.updatingTxHistory">
-          <button class="outline light-gray small expand m0"
+          <button class="outline light-gray round small expand m0"
             ng-click="index.updateTxHistory(index.skipHistory)"
             ng-if="!index.updatingTxHistory">
             <span translate>More</span> <i class="icon-arrow-down4 ng-scope"></i>
diff --git a/src/css/main.css b/src/css/main.css
index ca8f3f404..438846175 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -610,7 +610,6 @@ table tbody tr:last-child td {
 button.outline,
 button.outline:hover,
 button.outline:focus {
-  border-radius: 3px;
   background: transparent;
 }
 
@@ -620,7 +619,6 @@ button.outline:focus {
 button.outline.tiny,
 button.outline.tiny:hover,
 button.outline.tiny:focus {
-  border-radius: 3px;
   background: transparent;
 }
 
@@ -662,7 +660,6 @@ button.secondary:focus,
 .button.secondary:focus {
   background-color: #008CC1;
   color: #fff;
-  border-radius: 3px;
 }
 
 /* PRIMARY */
@@ -674,7 +671,6 @@ button.primary:focus,
 .button.primary:focus {
   background-color: #1ABC9C;
   color: #fff;
-  border-radius: 3px;
 }
 
 /* WARNING */
@@ -686,7 +682,6 @@ button.warning:focus,
 .button.warning:focus {
   background-color: #ED4A43;
   color: #fff;
-  border-radius: 3px;
 }
 
 /* WHITE */
@@ -701,6 +696,7 @@ button.black,
 .button.black {
   background-color: #2C3E50;
   color: #fff;
+  border: 1px solid transparent;
 }
 
 /* GRAY */
@@ -1138,6 +1134,10 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   cursor: pointer !important;
 }
 
+.preferences-icon {
+  padding: 0.6rem 0.8rem !important;
+}
+
 .passModal {
   background: #FFFFFF;
   box-shadow: 0px 0px 6px 0px rgba(0,0,0,0.50);
diff --git a/src/css/mobile.css b/src/css/mobile.css
index 68e705ff9..252899b64 100644
--- a/src/css/mobile.css
+++ b/src/css/mobile.css
@@ -256,6 +256,7 @@ a.missing-copayers {
 
 .button, button {
   padding: 1rem 1.2rem 1.0625rem;
+  border: 1px solid transparent;
 }
 
 .box-setup {
@@ -375,7 +376,7 @@ ul.off-canvas-list li a:hover {
 /* === */
 
 
-/* Have to set height explicity on ui-view 
+/* Have to set height explicity on ui-view
 to prevent collapsing during animation*/
 .main[ui-view]{
  height: 100%; /* TODO */
@@ -402,7 +403,7 @@ to prevent collapsing during animation*/
   animation-duration: .3s;
   animation-iteration-count: 1;
   animation-fill-mode: both;
-  
+
   -webkit-animation-timing-function:  ease-in-out;
   -webkit-animation-duration: .3s;
   -webkit-animation-iteration-count: 1;
@@ -574,10 +575,10 @@ to prevent collapsing during animation*/
   padding-bottom: 20px;
 }
 
-.reveal-modal.animated.slideInRight, 
-.reveal-modal.animated.slideOutRight, 
-.reveal-modal.animated.fadeOutUp, 
-.reveal-modal.animated.slideInUp, 
+.reveal-modal.animated.slideInRight,
+.reveal-modal.animated.slideOutRight,
+.reveal-modal.animated.fadeOutUp,
+.reveal-modal.animated.slideInUp,
 .reveal-modal.animated.slideInDown {
   -webkit-animation-duration: 0.3s;
   animation-duration: 0.3s;