diff --git a/css/src/main.css b/css/src/main.css
index 1d0d9cf2e..aaa07a796 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -944,7 +944,6 @@ button, .button, p {
 }
 
 .addresses .list-addr contact {
-  margin-left: 42px;
   cursor: text;
 }
 
@@ -1157,6 +1156,10 @@ a.text-warning:hover {color: #FD7262;}
   display: none;
 }
 
+fieldset legend {
+  background: transparent;
+}
+
 @media only screen and (min-width: 40.063em) {
   dialog.tiny, .reveal-modal.tiny {
     width: 50%;
diff --git a/views/addresses.html b/views/addresses.html
index 937dc186b..011e817bc 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -8,24 +8,28 @@
     <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
       <div class="large-12 medium-12" ng-init="showAll=0">
         <div class="oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
-          <div class="panel radius row show-for-large-up">
-            <div class="large-9 medium-9 column">
-              <div class="list-addr">
-                <i class="fi-thumbnails size-48" ng-click="openAddressModal(addr)">&nbsp;</i>
-                <span>
-                    <contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right">
-                  </span>
-                <span class="btn-copy" clip-copy="addr.address"> </span>
-                <small translate class="label" ng-if="addr.isChange">change</small>
+          <div class="panel radius show-for-large-up">
+            <div class="row collapse">
+              <div class="large-7 medium-9 column">
+                <div class="list-addr">
+                  <span>
+                      <contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right">
+                    </span>
+                  <span class="btn-copy" clip-copy="addr.address"> </span>
+                  <small translate class="label" ng-if="addr.isChange">change</small>
+                </div>
+              </div>
+              <div class="large-3 medium-3 column text-right">
+                <span ng-if="$root.updatingBalance">
+                    <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+                  </span>
+                <p class="size-14" ng-if="!$root.updatingBalance">
+                  <b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
+                </p>
+              </div>
+              <div class="large-1 columns show-for-large-up" ng-click="openAddressModal(addr)">
+                <a class="size-12" href=""> Show QR</a>
               </div>
-            </div>
-            <div class="large-3 medium-3 column text-right">
-              <span ng-if="$root.updatingBalance">
-                  <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-                </span>
-              <p class="size-14" ng-if="!$root.updatingBalance">
-                <b>{{addr.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}</b>
-              </p>
             </div>
           </div> <!-- end of panel large screen --> 
           <a class="db text-black panel radius row hide-for-large-up list-addr" ng-click="openAddressModal(addr)">
diff --git a/views/includes/transaction.html b/views/includes/transaction.html
index 7739fe637..59ed5b30c 100644
--- a/views/includes/transaction.html
+++ b/views/includes/transaction.html
@@ -8,7 +8,7 @@
     </a>
   </div>
   <div class="show-for-small-only small-12 columns m10b" ng-show="tx.comment">
-    <p class="size-14 label">
+    <p class="size-14 label ellipsis text-left">
       {{tx.comment}} Created by <strong>{{$root.wallet.publicKeyRing.nicknameForCopayer(tx.creator)}}</strong>
     </p>
   </div>