diff --git a/css/src/main.css b/css/src/main.css
index 82566a843..7831e8d16 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -924,8 +924,8 @@ button, .button, p {
 
 .addresses .list-addr i {
   position: absolute;
-  top: -25px;
-  left: 6px;
+  top: -15px;
+  left: 0;
   cursor: pointer;
 }
 
@@ -1195,5 +1195,10 @@ a.text-warning:hover {color: #FD7262;}
   padding: 50px;
 }
 
+.collapse {
+  margin: auto;
+  max-width: 100%;
+}
+
 
 /*-----------------------------------------------------------------*/
diff --git a/css/src/mobile.css b/css/src/mobile.css
index 5b8f44afa..9deb53219 100644
--- a/css/src/mobile.css
+++ b/css/src/mobile.css
@@ -131,6 +131,10 @@
     height: 200px;
   }
 
+  .addresses .panel {
+    padding: 1rem 0.8rem;
+  }
+
   .btn-copy {
     display: none;
   }
diff --git a/views/addresses.html b/views/addresses.html
index 6fbbf245e..5845c8b5b 100644
--- a/views/addresses.html
+++ b/views/addresses.html
@@ -7,30 +7,29 @@
     
     <div class="large-12 medium-12" ng-if="!!(addresses|removeEmpty).length">
       <div class="large-12 medium-12" ng-init="showAll=0">
-        <ul>
-          <li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll" ng-click="openAddressModal(addr)">
-
-            <div class="large-10 medium-9 small-8 column" >
-              <div class="ellipsis list-addr">
-                <i class="fi-thumbnails size-48 show-for-large-up">&nbsp;</i>
-                <span>
-                  <contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/>
+          <div class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll" ng-click="openAddressModal(addr)">
+            <div class="row collapse">
+              <div class="large-10 medium-9 small-8 column" >
+                <div class="ellipsis list-addr">
+                  <i class="fi-thumbnails size-48 show-for-large-up">&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 class="label" ng-if="addr.isChange">change</small>
+                </div>
+              </div>
+              
+              <div class="large-2 medium-3 small-4 column text-right">
+                <span ng-if="$root.updatingBalance">
+                  <i class="fi-bitcoin-circle icon-rotate spinner"></i>
+                </span>
+                <span class="size-12" ng-if="!$root.updatingBalance">
+                  {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
                 </span>
-                <span class="btn-copy" clip-copy="addr.address"> </span>
-                <small class="label" ng-if="addr.isChange">change</small>
               </div>
             </div>
-            
-            <div class="large-2 medium-3 small-4 column text-right">
-              <span ng-if="$root.updatingBalance">
-                <i class="fi-bitcoin-circle icon-rotate spinner"></i>
-              </span>
-              <span class="size-12" ng-if="!$root.updatingBalance">
-                {{addr.balance || 0|noFractionNumber}} {{$root.unitName}}
-              </span>
-            </div>
-          </li>
-        </ul>
+          </div>
 
         <a class="secondary radius" ng-click="showAll=!showAll" ng-show="(addresses|removeEmpty).length != (addresses|removeEmpty|limitAddress).length">
           <span ng-if="!showAll">Show all</span>