diff --git a/css/main.css b/css/main.css
index c81640c30..2aeba23e7 100644
--- a/css/main.css
+++ b/css/main.css
@@ -169,6 +169,11 @@ a:hover {
   padding: 0.2rem 0.4rem;
 }
 
+.waiting {
+  border: 2px solid #fff;
+}
+
+
 .online {
   border: 2px solid #1ABC9C;
 }
@@ -302,11 +307,7 @@ a:hover {
 }
 
 .button-setup a:hover {
-  background: #fff;
-}
-
-.button-setup a:hover h1 {
-  color: #34495E;
+  background: #3C4E60;
 }
 
 .footer-setup {
@@ -319,6 +320,7 @@ a:hover {
 
 .dn {display: none;}
 .pr {position: relative;}
+.pa {position: absolute;}
 .m0 {margin: 0;}
 .db {display: block;}  
 .size-12 { font-size: 12px; }      
@@ -334,20 +336,25 @@ a:hover {
 .m5t {margin-top: 5px;}
 .m10t {margin-top: 10px;}
 .m5b {margin-bottom: 5px;}
+.m5r {margin-right: 5px;}
 .m10b {margin-bottom: 10px;}
 .m15b {margin-bottom: 20px;}
 .m10r {margin-right: 10px;}
 .m15l {margin-left: 15px;}
+.m15t {margin-top: 15px;}
 .m20r {margin-right: 20px;}
+.m15r {margin-right: 15px;}
 .m20t {margin-top: 20px;}
 .m10 {margin: 10px;}
 .m15 {margin: 15px;}
+.m15h {margin: 0 15px;}
 .p10t {padding-top: 10px;}
 .p0r {padding-right: 0;}
 .p70r {padding-right: 70px;}
 .p70l {padding-left: 70px;}
 .p5h {padding: 0 5px;}
 .p20h {padding: 0 20px;}
+.p15 {padding:15px;}
 .p20 {padding:20px;}
 .p10 {padding:10px;}
 .m30v {margin: 30px 0;}
@@ -596,6 +603,8 @@ input[type=number]::-webkit-outer-spin-button {
   color: #B4D455;
 }
 
+.success {background-color: #1ABC9C !important;}
+
 p.dr-notification-text {
   margin-top: -5px;
   font-size: 12px;
@@ -798,9 +807,9 @@ button[disabled].white:focus,
 }
 
 .video-box {
-  width: 90px;
+  width: 70px;
   text-align: center;
-  margin-right: 10px;
+  margin-right: 20px;
   padding-bottom: 5px;
   float: left;
 }
@@ -856,7 +865,8 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   overflow-y: hidden;
 }
 
-.text-gray {color: #8597A7;}
+.text-light {font-weight: 100;}
+.text-gray {color: #8597A7 !important;}
 .text-primary {color: #1ABC9C;}
 .text-secondary {color: #3498DB;}
 .text-white {color: #fff;}
@@ -886,4 +896,10 @@ a.text-white:hover {color: #ccc;}
   top: 40%;
 }
 
+.box-setup .panel {
+  background-color: #2C3E50;
+  padding: 0.5rem;
+  border: 0;
+}
+
 /*-----------------------------------------------------------------*/
diff --git a/views/includes/copayers.html b/views/includes/copayers.html
index d331b2b29..41e3f5f2c 100644
--- a/views/includes/copayers.html
+++ b/views/includes/copayers.html
@@ -1,62 +1,95 @@
 <div ng-controller="BackupController" ng-if='$root.wallet && !$root.wallet.isReady() && !loading'>
-  <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
-    <h2>Share this secret with your other copayers</h2>
-    <div class="panel input">
-      <p class="ellipsis text-gray">{{$root.wallet.getSecret()}}</p>
+  <div class="row signin">
+     <div class="large-4 columns logo-setup text-center">
+        <img src="../img/logo-negative-beta.svg" alt="Copay">
     </div>
-  </div>
-  <h2 ng-if="$root.wallet && $root.wallet.publicKeyRing.isComplete()">
-    New Wallet Created
-  </h2>
-  <h3 ng-show="!$root.wallet.publicKeyRing.isComplete()">Waiting Copayers for {{$root.wallet.getName()}}</h3>
-  <h4
-    ng-show="$root.wallet.publicKeyRing.isComplete()">
-    {{$root.wallet.getName()}} - 
-    {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}
-  </h4>
-  <span ng-show="$root.wallet && !$root.wallet.publicKeyRing.isComplete()">
-    {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet
-  </span>
-  <div ng-include="'views/includes/video.html'"></div> 
-  
-  <div  ng-if="!$root.wallet.publicKeyRing.isComplete()">
-    <i class="fi-bitcoin-circle icon-rotate spinner"></i> Waiting for other copayers to join
-  </div>
+    <div class="large-8 columns line-dashed-setup-v">
+      <div class="box-setup oh">
+        <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
+          <h1 class="text-primary line-sidebar-b">Waiting copayers</h1>
+          <h3>Share this secret with your other copayers</h3>
+          <div class="panel">
+            <p class="ellipsis text-gray size-14">{{$root.wallet.getSecret()}}</p>
+          </div>
+        </div>
+        <h1 class="text-white line-sidebar-b" ng-if="$root.wallet && $root.wallet.publicKeyRing.isComplete()">New Wallet Created </h1>
+        <div class="row" ng-show="$root.wallet.publicKeyRing.isComplete()">
+          <div class="large-6 columns text-left">
+            <h3>Download Backup</h3>
+          </div>
+          <div class="large-6 columns text-right">
+            <small class="text-gray">
+              <b>{{$root.wallet.getName()}}</b> : 
+              {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}}
+            </small>
+          </div>
+        </div>
+        <div class="row">
+          <div class="large-8 columns text-left">
+            <h3 ng-show="!$root.wallet.publicKeyRing.isComplete()">Waiting Copayers for {{$root.wallet.getName()}}</h3>
+          </div>
+          <div class="large-4 columns text-right">
+            <small class="text-gray" ng-show="$root.wallet && !$root.wallet.publicKeyRing.isComplete()">
+              {{$root.wallet.requiredCopayers}}-of-{{$root.wallet.totalCopayers}} wallet
+            </small>
+          </div>
+        </div>
 
-  <div  ng-if="$root.wallet && $root.wallet.publicKeyRing.isComplete()">
-    <i class="fi-bitcoin-circle icon-rotate spinner"></i> Waiting for other
-    copayers to make a Backup
-  </div>
+        <div class="box-setup-copayers oh p20">
+          <div ng-include="'views/includes/video.html'"></div> 
+          <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
+            <img
+            class="waiting br100 no-video"
+            ng-if="!hasVideo(copayer)"
+            src="./img/satoshi.gif"
+            alt="{{copayer.nick}}"
+            width="70">
+            <p class="size-12 text-white text-light m0">
+              <i class="fi-loop icon-rotate spinner"></i>
+              Waiting...
+            </p>
+          </div>
+        </div>
 
-  <a ng-click="dowloadBackup()"
-    ng-show="!$root.wallet.publicKeyRing.isComplete()">Download seed backup</a>
-  <button class="button primary radius right"
-    ng-click="backup()"
-    ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
-    ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
-    <span ng-show="$root.wallet.publicKeyRing.isComplete()" >
-      Backup wallet
-    </span>
-    <span ng-show="!$root.wallet.publicKeyRing.isComplete()" >
-      <span ng-show="$root.wallet.publicKeyRing.remainingCopayers() > 1">
-        {{ $root.wallet.publicKeyRing.remainingCopayers() }} people have
-      </span>
-      <span ng-show="$root.wallet.publicKeyRing.remainingCopayers() == 1">
-        One person has
-      </span>
-      yet to join.
-    </span>
-  </button>
-  <button class="button primary radius right"
-    disabled="disabled"
-    ng-show="$root.wallet.publicKeyRing.isBackupReady()">
-    <span ng-show="$root.wallet.publicKeyRing.remainingBackups() > 1">
-      {{ $root.wallet.publicKeyRing.remainingBackups() }} people have
-      <span ng-show="$root.wallet.publicKeyRing.remainingBackups() == 1">
-        One person has
-      </span>
-      yet to backup the wallet.
-    </span>
-  </button>
+        <div class="text-gray left" ng-if="$root.wallet && $root.wallet.publicKeyRing.isComplete()">
+          <i class="text-white fi-loop icon-rotate spinner"></i> Waiting for other
+          copayers to make a Backup
+        </div>
+        
+        <div class="text-right">
+          <a class="text-primary m20r" ng-click="dowloadBackup()"
+            ng-show="!$root.wallet.publicKeyRing.isComplete()">Download seed backup</a>
+          <button class="button primary m0"
+            ng-click="backup()"
+            ng-show="!$root.wallet.publicKeyRing.isBackupReady()"
+            ng-disabled="!$root.wallet.publicKeyRing.isComplete()">
+            <span ng-show="$root.wallet.publicKeyRing.isComplete()" >
+              Backup wallet
+            </span>
+            <span ng-show="!$root.wallet.publicKeyRing.isComplete()" >
+              <span ng-show="$root.wallet.publicKeyRing.remainingCopayers() > 1">
+                {{ $root.wallet.publicKeyRing.remainingCopayers() }} people have
+              </span>
+              <span ng-show="$root.wallet.publicKeyRing.remainingCopayers() == 1">
+                One person has
+              </span>
+              yet to join.
+            </span>
+          </button>
+          <button class="button primary"
+            disabled="disabled"
+            ng-show="$root.wallet.publicKeyRing.isBackupReady()">
+            <span ng-show="$root.wallet.publicKeyRing.remainingBackups() > 1">
+              {{ $root.wallet.publicKeyRing.remainingBackups() }} people have
+              <span ng-show="$root.wallet.publicKeyRing.remainingBackups() == 1">
+                One person has
+              </span>
+              yet to backup the wallet.
+            </span>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div> <!-- end of row -->
 </div>
 
diff --git a/views/includes/video.html b/views/includes/video.html
index f752f6d64..09c7132e7 100644
--- a/views/includes/video.html
+++ b/views/includes/video.html
@@ -7,20 +7,21 @@
       ng-src="{{getVideoURL(copayer)}}"></video>
 
     <img
-      class="no-video"
+      class="br100 no-video"
       ng-if="!hasVideo(copayer)"
       ng-class="isConnected(copayer) ? 'online' : 'offline'"
       src="./img/satoshi.gif"
-      alt="{{copayer}}">
+      alt="{{copayer}}"
+      width="70">
 
     <div
       tooltip="ID: {{copayer.peerId}}"
       tooltip-placement="bottom">
-      <span ng-show="copayer.index == 0">you</span>
-      <span ng-show="copayer.index > 0">{{copayer.nick}}</span>
+      <small class="text-gray" ng-show="copayer.index == 0"><i class="fi-check m5r"></i>you</small>
+      <small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
     </div>
 
-    <div class="success label" ng-show="isBackupReady(copayer)">
+    <div class="success label m10t" ng-show="isBackupReady(copayer)">
       Backup ready
     </div>
   </div>
diff --git a/views/setup.html b/views/setup.html
index e29748ac4..a8e89f89c 100644
--- a/views/setup.html
+++ b/views/setup.html
@@ -32,7 +32,7 @@
                     class='size-12'>Tip: Use lower and uppercase, numbers and
                     symbols</span>" 
                   tooltip-trigger="focus" required
-                  tooltip-placement="bottom">
+                  tooltip-placement="left">
                   
                   <input type="password" 
                   placeholder="Repeat password"