diff --git a/css/src/main.css b/css/src/main.css
index 3fd9163fd..2db9e908d 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -349,7 +349,7 @@ a:hover {
 
 .main {
   margin-left: 250px;
-  padding: 100px 2.5rem;
+  padding: 100px 2rem;
   background-color: #F8F8FB;
 }
 
@@ -1133,6 +1133,7 @@ button.gray:focus,
   background: #7A8C9E;
   border-radius: 100%;
   vertical-align: middle;
+  overflow: hidden;
 }
 
 a:hover .photo-container  {
@@ -1309,9 +1310,8 @@ a.text-warning:hover {color: #FD7262;}
   margin-bottom: 15px;
 }
 
-.box-setup-copay-required {
-  border: 3px solid #1ABC9C;
-  opacity: 1;
+.box-setup-copay-required .photo-container {
+  background-color: #1ABC9C;
 }
 
 .loading-screen {
diff --git a/views/copayers.html b/views/copayers.html
index 3c6b08631..b72b5a1fa 100644
--- a/views/copayers.html
+++ b/views/copayers.html
@@ -21,12 +21,8 @@
         <div class="panel p20">
           <div class="oh">
             <div ng-include="'views/includes/copayer.html'"></div> 
-            <div ng-if="!$root.wallet.isReady()">
-              <img
-              class="waiting br100"
-              src="./img/satoshi.gif"
-              alt="Waiting Copayer"
-              width="70">
+            <div class="copay-box" ng-if="!$root.wallet.isReady()">
+              <span ng-include="'views/includes/photo.html'"></span>
               <p class="size-12 text-white text-light m0">
               <i class="fi-loop icon-rotate spinner"></i>
               <span translate>Waiting...</span>
diff --git a/views/create.html b/views/create.html
index 15a86287b..1f6e21dbb 100644
--- a/views/create.html
+++ b/views/create.html
@@ -27,8 +27,10 @@
             </div>
           </div>
           <div class="box-setup-copayers">
-            <div class="box-setup-copayers p10">
-              <img class="br100 oh box-setup-copay m10" ng-repeat="i in getNumber(totalCopayers) track by $index" src="./img/satoshi.gif" title="Copayer {{$index+1}}-{{totalCopayers}}" ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}" width="50px">
+            <div class="box-setup-copayers p10 oh">
+              <div class="copay-box" ng-class="{'box-setup-copay-required': ($index+1) <= requiredCopayers}" ng-repeat="i in getNumber(totalCopayers) track by $index">
+                <span ng-include="'views/includes/photo.html'"></span>
+              </div>
             </div>
           </div>
           <p translate class="comment" ng-show="totalCopayers>1">(*) The limits are imposed by the bitcoin network.</p>
diff --git a/views/homeWallet.html b/views/homeWallet.html
index e73a9016d..1b500a43c 100644
--- a/views/homeWallet.html
+++ b/views/homeWallet.html
@@ -3,66 +3,65 @@
     <h1 translate  class="hide-for-large-up">Home</h1> 
 
  <!-- Wallet name and balance -->
-    <div class="panel large-12 columns">
+    <div class="panel">
       <div class="row collapse">
-        <div class="large-1 columns">
+        <div class="large-1 small-2 columns">
           <div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
         </div>
-        <div class="large-9 columns">
+        <div class="large-9 small-5 columns">
           <h2 class="ellipsis m10t">{{$root.wallet.getName()}}</h2>
         </div>
-        <div class="large-2 columns text-right text-black" ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
+        <div class="large-2 small-5 columns text-right text-black" ng-if="$root.wallet && !$root.updatingBalance" data-options="disable_for_touch:true">
           <b class="db m5b size-21">{{totalBalance || 0 |noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
           <span class="size-14 m5t text-gray">{{totalBalanceAlternative |noFractionNumber:2}} {{alternativeIsoCode}}</span>
         </div>
       </div>
     </div>
-  </div>
 
-  <!-- Address-->
-    <div class="large-6 columns">
-      <div class="panel oh">
-        <h2 class="line-b" translate>Quick receive</h2>
-        <div>
-          <qrcode size="220" data="bitcoin:{{address.addressStr}}"></qrcode>
+    <div class="row">
+      <!-- Address-->
+      <div class="large-6 columns">
+        <div class="panel oh">
+          <h2 class="line-b" translate>Quick receive</h2>
+          <div class="text-center">
+            <qrcode size="220" data="bitcoin:{{address.addressStr}}"></qrcode>
 
-          <div class="m10t">
-            <h4 class="size-12">{{address.addressStr}} <span class="btn-copy" clip-copy="address.addressStr"></span></h4>
-            <span ng-if="$root.updatingBalance">
-              <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-            </span>
-            <div class="small-10 columns small-centered">
-              <button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy(address.addressStr)">
-                <i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
-              </button>
+            <div class="m10t">
+              <h4 class="size-12">{{address.addressStr}} <span class="btn-copy" clip-copy="address.addressStr"></span></h4>
+              <span ng-if="$root.updatingBalance">
+                <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+              </span>
+              <div class="small-10 columns small-centered">
+                <button class="m15t button secondary hide-for-large-up" ng-show="isMobile" ng-click="mobileCopy(address.addressStr)">
+                  <i class="fi-link">&nbsp;</i> <span translate>Copy to clipboard</span>
+                </button>
+              </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
- 
 
 
-    <!-- List of copayers -->
-    <div class="large-6 columns">
-      <div class="panel oh">
-        <h2 class="line-b" translate>Copayers</h2>
-        <div class="copay-box" ng-repeat="copayer in copayersList()">
-          <img
-            class="br100 online"
-            src="./img/satoshi.gif"
-            alt="{{copayer.peerId}}"
-            width="70">
-          <div
-            class="ellipsis"
-            tooltip="ID: {{copayer.peerId}}"
-            tooltip-placement="bottom">
-            <small class="text-gray" ng-show="copayer.index == 0">
-              <i class="fi-check m5r"></i>{{'Me'|translate}}</small>
-            <small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
+
+      <!-- List of copayers -->
+      <div class="large-6 columns">
+        <div class="panel oh">
+          <h2 class="line-b" translate>Copayers</h2>
+          <div class="copay-box" ng-repeat="copayer in copayersList()">
+            <span ng-include="'views/includes/photo.html'"></span>
+            <div
+              class="ellipsis"
+              tooltip="ID: {{copayer.peerId}}"
+              tooltip-placement="bottom">
+              <small class="text-gray" ng-show="copayer.index == 0">
+                <i class="fi-check m5r"></i>{{'Me'|translate}}</small>
+              <small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
+            </div>
+            <div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
           </div>
-          <div translate class="success label m10t" ng-show="isBackupReady(copayer)">Ready</div>
-        </div>
-      </div> 
+        </div> 
+      </div>
     </div>
+  </div>
+</div>
 
diff --git a/views/includes/copayer.html b/views/includes/copayer.html
index 9ac58888b..7b01e26e4 100644
--- a/views/includes/copayer.html
+++ b/views/includes/copayer.html
@@ -1,11 +1,6 @@
 <div ng-controller="CopayersController">
   <div class="copay-box" ng-repeat="copayer in copayersList()">
-    <img
-      class="br100 online"
-      src="./img/satoshi.gif"
-      alt="{{copayer.peerId}}"
-      width="70">
-
+    <span ng-include="'views/includes/photo.html'"></span>
     <div
       class="ellipsis"
       tooltip="ID: {{copayer.peerId}}"
diff --git a/views/includes/head.html b/views/includes/head.html
index 27c9eb3cd..2f5e8c247 100644
--- a/views/includes/head.html
+++ b/views/includes/head.html
@@ -7,7 +7,7 @@
 <div class="menu" ng-mouseover="hoverIn()" ng-mouseleave="hoverOut()"
   ng-click="hoverMenu = !hoverMenu">
   <a class="dropdown ellipsis text-gray" ng-class="{'hover': hoverMenu}">
-    <span class="photo-container"><i class="fi-torso size-42"></i></span>
+    <span ng-include="'views/includes/photo.html'"></span>
     <span class="m15t">{{username}} </span>
     <i class="icon-arrow-down size-16 vm"></i> 
   </a>
diff --git a/views/includes/photo.html b/views/includes/photo.html
new file mode 100644
index 000000000..3e039d6c2
--- /dev/null
+++ b/views/includes/photo.html
@@ -0,0 +1 @@
+<span class="photo-container"><i class="fi-torso size-42"></i></span>
diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html
index 6861c9858..e10055c28 100644
--- a/views/includes/sidebar.html
+++ b/views/includes/sidebar.html
@@ -67,7 +67,6 @@
         </div>
       </li>
     </ul>
-      <!-- <a ui-route="{{create}}" href="#!/manage" class="button-setup add-wallet db p20h" title="Create"><i class="m5r fi-plus"></i> {{'Add Wallet' | translate }} </a> -->
   </div>
 
   <ul class="side-nav" ng-if="!walletSelection && $root.wallet.isReady()">