diff --git a/css/src/animation.css b/css/src/animation.css
index 3c86fca2b..7bb6e5238 100644
--- a/css/src/animation.css
+++ b/css/src/animation.css
@@ -43,10 +43,10 @@
 }
 
 .dr-notification-close-btn:hover {
-  -webkit-transform: scale3d(1.25, 1.25, 1);
-  -moz-transform: scale3d(1.25, 1.25, 1);
-  -ms-transform: scale3d(1.25, 1.25, 1);
-  transform: scale3d(1.25, 1.25, 1);
+  -webkit-transform: scale3d(1.1, 1.1, 1);
+  -moz-transform: scale3d(1.1, 1.1, 1);
+  -ms-transform: scale3d(1.1, 1.1, 1);
+  transform: scale3d(1.1, 1.1, 1);
 }
 
 .slideDown{
diff --git a/css/src/desktop.css b/css/src/desktop.css
index be2e39728..21db4ac7a 100644
--- a/css/src/desktop.css
+++ b/css/src/desktop.css
@@ -56,6 +56,16 @@ table tr:hover {
   cursor: pointer;
 }
 
+.button.outline.light-gray:hover {
+  background: rgba(206,213,220,0.40);
+  color: #4B6178;
+}
+
+.button.outline.dark-gray:hover {
+  background: rgba(255,255,255,.1);
+  color: #fff;
+}
+
 button.secondary:hover, 
 button.secondary:focus, 
 .button.secondary:hover, 
diff --git a/css/src/main.css b/css/src/main.css
index fef8902b9..658943160 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -534,23 +534,6 @@ ul.tx-copayers {
   background-color: #213140;
 }
 
-a.button-setup {
-  border-radius: 3px;
-  border: 1px solid #ccc;
-  display: block;
-  padding: 0.5rem;
-  background: transparent;
-  color: #A0A3A6;
-}
-
-.createProfile a.button-setup, .home a.button-setup, .settings a.button-setup, .import-profile a.button-setup {
-  border-radius: 3px;
-  border: 1px solid #3E5366;
-  display: block;
-  padding: 0.5rem;
-  background: transparent;
-}
-
 .dn {display: none;}
 .dni {display: none !important;}
 .pr {position: relative;}
@@ -724,7 +707,7 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .dr-notification-container.top {
-  top: 60px;
+  top: 70px;
 }
 
 .dr-notification-container.center {
@@ -733,45 +716,37 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .dr-notification-wrapper {
-  width: 400px;
+  width: 375px;
   position: relative;
-  margin: 0 0 1px 0;
-}
-
-.dr-notification {
-  width: 400px;
-  clear: both;
-  overflow: hidden;
+  margin: 0 0 5px 0;
 }
 
 .dr-notification-close-btn {
-  -webkit-border-radius: 20px;
-  -moz-border-radius: 20px;
-  -ms-border-radius: 20px;
-  border-radius: 20px;
+  color: #A5B2BF;
+  border: 1px solid #CED5DC;
+  border-radius: 100%;
   display: inline-block;
-  padding: 5px;
+  padding: 4px 7px;
   font-size: 18px;
   position: absolute;
   right: 5px;
   top: 5px;
   cursor: pointer;
   z-index: 10;
+  margin: 13px 8px 0;
 }
 
 .dr-notification-image {
   float: left;
-  display: block;
-  font-size: 40px;
-  color: white;
+  padding: 0.8rem;
+  color: #7A8C9E;
   text-align: center;
-  border-right: 1px dashed #415970;
-}
-.dr-notification-image i {
-  display: block;
-  width: 100%;
-  padding: 20px;
+  background-color: #E4E8EC;
+  font-size: 30px;
+  width: 50px;
+  height: 100%;
 }
+
 .dr-notification-image img {
   margin: 15px;
   max-width: 70px;
@@ -779,48 +754,25 @@ input[type=number]::-webkit-outer-spin-button {
 }
 
 .dr-notification-content {
-  padding-left: 80px;
-  padding-right: 30px;
-  padding-top: 5px;
-  padding-bottom: 5px;
+  padding: 7px 70px 5px 65px;
 }
 
 .dr-notification-title {
-  color: white;
+  color: #4B6178;
   padding: 0px;
   font-size: 16px;
-  margin-top: 0;
+  margin-bottom: 3px;
+  font-weight: 700;
 }
 
 .dr-notification {
-  background-color: #34495E;
-  color: #eee;
-  border: 1px solid #2C3E50;
-}
-.dr-notification-close-btn {
-  background-color: #34495E;
-  color: #fff;
-  border: 1px solid #3C5269;
-}
-
-.dr-notification-image.dr-notification-type-info {
-  color: #FFF;
-}
-
-.dr-notification-image.dr-notification-type-warning {
-  color: #FFA226;
-}
-
-.dr-notification-image.dr-notification-type-error {
-  color: #FF4B4F;
-}
-
-.dr-notification-image.dr-notification-type-success {
-  color: #1ABC9C;
-}
-
-.dr-notification-image.success {
-  color: #1ABC9C;
+  background: rgba(255,255,255,0.95);
+  box-shadow: 0 1px 5px 0 rgba(0,0,0,0.15);
+  width: 400px;
+  clear: both;
+  overflow: hidden;
+  border-radius: 3px 0 0 3px;
+  height: 60px;
 }
 
 .success { 
@@ -875,6 +827,7 @@ input[type=number]::-webkit-outer-spin-button {
 .dr-notification-text {
   font-size: 12px;
   line-height: 120%;
+  color: #7A8C9E;
 }
 
 .ellipsis {
@@ -992,6 +945,24 @@ input[type=date], input[type=datetime-local], input[type=datetime], input[type=e
   font-size: 13px;
 }
 
+/*////////////////////////////  BUTTON OUTLINE  ////////////////////////////*/
+
+.button.outline {
+  border-radius: 3px;
+  background: transparent;
+  text-transform: none;
+}
+
+.button.outline.dark-gray {
+  border: 1px solid #A5B2BF;
+  color: #A5B2BF;
+}
+
+.button.outline.light-gray {
+  border: 1px solid #CED5DC;
+  color: #7A8C9E;
+}
+
 /* SECONDARY */
 button.secondary, 
 .button.secondary { 
diff --git a/css/src/mobile.css b/css/src/mobile.css
index a8ad1a489..8000d459e 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -359,17 +359,6 @@
     -webkit-tap-highlight-color:rgba(0,0,0,0);
   }
 
-  .add-wallet .button-setup {
-    border: 1px solid #A5B2BF;
-    border-radius: 5px;
-    color: #7A8C9E;
-    text-align: center;
-    padding: 2rem;
-    margin: 2rem 0;
-    text-transform: uppercase;
-    font-size: 16px;
-  }
-
   .modal.fade, .reveal-modal-bg {
     opacity: 1;
   }
@@ -441,6 +430,9 @@
 
   .dr-notification {
     width: 100%;
+    border-radius: 0;
+    box-shadow: none;
+    border-bottom: 1.5px solid #D6DBE0;
   }
 
   .dr-notification-container {
@@ -465,12 +457,8 @@
   }
 
   .dr-notification-text {
-    font-size: 10px;
-    line-height: 100%;
-  }
-
-  .dr-notification-image i {
-    padding: 15px;
+    font-size: 12px;
+    line-height: 120%;
   }
 
 }
diff --git a/js/services/notifications.js b/js/services/notifications.js
index cf97cdd26..4f4ef1e99 100644
--- a/js/services/notifications.js
+++ b/js/services/notifications.js
@@ -145,7 +145,7 @@ factory('notification', ['$timeout',
       },
 
       funds: function(title, content, userData) {
-        return this.awesomeNotify('funds', 'bitcoin', title, content, userData);
+        return this.awesomeNotify('funds', 'bitcoin-circle', title, content, userData);
       },
 
       version: function(title, content, severe) {
diff --git a/views/create.html b/views/create.html
index e3cadd62e..084769dda 100644
--- a/views/create.html
+++ b/views/create.html
@@ -47,7 +47,7 @@
             <div class="line-dashed-h m20b"></div>
 
             <div class="m20b oh">
-              <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+              <a class="button outline light-gray 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> 
diff --git a/views/createProfile.html b/views/createProfile.html
index 9a9ac84ca..00192c87b 100644
--- a/views/createProfile.html
+++ b/views/createProfile.html
@@ -103,13 +103,13 @@
 
         <div class="box-setup-footer">
           <div class="left">
-            <a class="button-setup text-gray" href="#!/">
-              <i class="icon-arrow-left4"></i> 
+            <a class="button outline dark-gray tiny" ng-click="$root.go('/')">
+              <i class="icon-arrow-left4 size-10"></i> 
               <span translate>Back</span>
             </a>
           </div>
           <div class="right">
-            <a class="button-setup text-gray" 
+            <a class="button outline dark-gray tiny" 
               ng-click="$root.openExternalLink('https://copay.io/profile-storage.html')"> 
               Learn more about this option
             </a>
diff --git a/views/errors/404.html b/views/errors/404.html
index aa9f768a2..59fb733c9 100644
--- a/views/errors/404.html
+++ b/views/errors/404.html
@@ -6,6 +6,11 @@
   </div>
   <h1 class="text-center" ng-class="{'text-white': !$root.iden}">404</h1>
   <h3 translate class="text-center" ng-class="{'text-white': !$root.iden}">Page not found</h3>
-  <p class="text-center"><a href="#!/">&laquo; <span translate>Back</span></a></p>
+  <p class="text-center">
+  <a class="button outline dark-gray tiny" ng-click="$root.go('/')"> 
+    <i class="icon-arrow-left4 size-10"></i>
+    <span translate>Back</span>
+  </a>
+  </p>
 </div>
 <div class="extra-margin-bottom"></div>
diff --git a/views/home.html b/views/home.html
index 4f747818d..20ac808ae 100644
--- a/views/home.html
+++ b/views/home.html
@@ -126,8 +126,6 @@
  {{hideAll}}
         </button>
       </form>
-
-aasdas
         <div ng-if="usingLocalStorage" class="text-gray size-12 m10v">
           * Using this device storage. Change to cloud storage on 'settings'.
         </div>
@@ -137,21 +135,21 @@ aasdas
       <div class="box-setup-footer">
 
         <div class="right">
-          <a class="button-setup text-gray"  ng-click="$root.go('/settings')">
-            <i class="icon-wrench"></i> 
+          <a class="button outline dark-gray tiny"  ng-click="$root.go('/settings')">
+            <i class="icon-wrench show-for-large-up size-14"></i> 
             <span translate>Settings</span>
           </a>
         </div>
 
         <div class="left m10r">
-          <a class="button-setup text-gray"  ng-click="$root.go('/createProfile')">
-            <i class="icon-person"></i> 
+          <a class="button outline dark-gray tiny"  ng-click="$root.go('/createProfile')">
+            <i class="icon-person show-for-large-up size-14"></i> 
             <span translate>Create profile</span>
           </a>
         </div>
         <div class="left">
-          <a class="button-setup text-gray"  ng-click="$root.go('/importProfile')">
-            <i class="icon-upload"></i> 
+          <a class="button outline dark-gray tiny"  ng-click="$root.go('/importProfile')">
+            <i class="icon-upload show-for-large-up size-14"></i> 
             <span translate>Import</span>
           </a>
         </div>
diff --git a/views/import.html b/views/import.html
index 495e9fda0..a47532a6e 100644
--- a/views/import.html
+++ b/views/import.html
@@ -55,7 +55,7 @@
             <div class="line-dashed-h m20b"></div>
 
             <div class="m20b oh">
-              <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+              <a class="button outline light-gray 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> 
diff --git a/views/importProfile.html b/views/importProfile.html
index 591a36eac..c7fa07c03 100644
--- a/views/importProfile.html
+++ b/views/importProfile.html
@@ -53,8 +53,8 @@
         </form>
         <div class="box-setup-footer">
           <div class="left">
-            <a class="button-setup text-gray" href="#!/">
-              <i class="icon-arrow-left4"></i> 
+            <a class="button outline dark-gray tiny" ng-click="$root.go('/')">
+              <i class="icon-arrow-left4 size-10"></i> 
               <span translate>Back</span>
             </a>
           </div>
diff --git a/views/includes/notifications.html b/views/includes/notifications.html
index 2fe5a803d..2259822a3 100644
--- a/views/includes/notifications.html
+++ b/views/includes/notifications.html
@@ -3,13 +3,13 @@
     <i class="fi-x"></i>
   </div>
   <div class="dr-notification">
-    <div class="dr-notification-image dr-notification-type-{{noti.type}}" ng-switch on="noti.image">
+    <div class="dr-notification-image" ng-switch on="noti.image">
       <i class="fi-{{noti.icon}}" ng-switch-when="false"></i>
       <img ng-src="{{noti.image}}" ng-switch-default />
     </div>
     <div class="dr-notification-content">
       <h3 class="dr-notification-title">{{noti.title|translate}}</h3>
-      <div class="dr-notification-text">{{noti.content|translate}}</div>
+      <div class="dr-notification-text ellipsis">{{noti.content|translate}}</div>
     </div>
   </div>
 </div>
diff --git a/views/join.html b/views/join.html
index a9ef7b069..873042cb8 100644
--- a/views/join.html
+++ b/views/join.html
@@ -46,7 +46,7 @@
             <div class="line-dashed-h m20b"></div>
 
             <div class="m20b oh">
-              <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+              <a class="button outline light-gray 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> 
diff --git a/views/more.html b/views/more.html
index 58301d014..a3b794679 100644
--- a/views/more.html
+++ b/views/more.html
@@ -83,7 +83,7 @@
 
   <div class="m20b row">
     <div class="large-12 columns">
-      <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+      <a class="button outline light-gray 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> 
diff --git a/views/profile.html b/views/profile.html
index 5a1673da0..ce710ce9d 100644
--- a/views/profile.html
+++ b/views/profile.html
@@ -68,7 +68,7 @@
   
   <div class="row oh m20b">
     <div class="large-12 columns">
-      <a class="small left button-setup" ng-click="hideAdv=!hideAdv">
+      <a class="button outline light-gray 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> 
diff --git a/views/settings.html b/views/settings.html
index 82bc06fd8..13cc014a8 100644
--- a/views/settings.html
+++ b/views/settings.html
@@ -76,13 +76,13 @@
       </form>
       <div class="box-setup-footer">
         <div class="left">
-          <a class="button-setup text-gray" href="#!/">
-            <i class="icon-arrow-left4"></i> 
+          <a class="button outline dark-gray tiny" ng-click="$root.go('/')">
+            <i class="icon-arrow-left4 size-10"></i> 
             <span translate>Back</span>
           </a>
         </div>
         <div class="right">
-          <a class="button-setup text-gray" href="" ng-click="reset()">
+          <a class="button outline dark-gray tiny" href="" ng-click="reset()">
             <i class="fi-page-delete"></i> 
             <span translate>Reset settings</span>
           </a>