diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index 7783fad68..28414b628 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -2,23 +2,23 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Global Settings</ion-nav-title>
   </ion-nav-bar>
-  <ion-content ng-controller="tabSettingsController"  ng-init="init()">
-    <div class="item item-divider">
-    </div>
+
+  <ion-content ng-controller="tabSettingsController" ng-init="init()">
     <div class="list">
+      <div class="item item-divider"></div>
+
       <div class="item item-icon-left" ng-click="openAddressbookModal()">
         <i class="icon ion-ios-book-outline"></i>
         <span translate>Address Book</span>
       </div>
+
       <div class="item item-icon-left" href ui-sref="settings.feedback">
         <i class="icon ion-ios-heart-outline"></i>
         <span translate>Feedback</span>
       </div>
-    </div>
-    <div class="item item-divider">
-      Preferences
-    </div>
-    <div class="list">
+
+      <div class="item item-divider">Preferences</div>
+
       <div class="item item-icon-left" href ui-sref="settings.language">
         <i class="icon ion-ios-chatbubble-outline"></i>
         <span translate>Language</span>
@@ -26,6 +26,7 @@
           {{currentLanguageName|translate}}
         </span>
       </div>
+
       <div class="item item-icon-left" href ui-sref="settings.unit">
         <i class="icon ion-ios-calculator-outline"></i>
         <span translate>Unit</span>
@@ -33,6 +34,7 @@
           {{unitName}}
         </span>
       </div>
+
       <div class="item item-icon-left" href ui-sref="settings.altCurrency">
         <i class="icon ion-social-usd-outline"></i>
         <span translate>Alternative Currency</span>
@@ -40,6 +42,7 @@
           {{selectedAlternative.name}}
         </span>
       </div>
+
       <div class="item item-icon-left" href ui-sref="settings.fee">
         <i class="icon ion-ios-film-outline"></i>
         <span translate>Bitcoin Network Fee Policy</span>
@@ -47,39 +50,38 @@
           {{feeOpts[currentFeeLevel]|translate}}
         </span>
       </div>
-    </div>
-    <div class="list" ng-show="usePushNotifications && PNEnabledByUser">
-      <div class="item item-divider">
-        Notifications
-      </div>
-      <ion-toggle ng-model="pushNotifications" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
-        <span class="toggle-label" translate>Enable push notifications</span>
-      </ion-toggle>
-      <div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
-        <div translate>Push notifications for Copay are currently disabled. Enable them in the Settings app.</div>
-        <ul ng-click="openSettings()">
-          <li translate>Open Settings app</li>
-        </ul>
-      </div>
-    </div>
-    <div class="item item-divider">
-      Exchanges
-    </div>
-    <ion-toggle ng-show="!isWP" ng-model="glideraEnabled" toggle-class="toggle-balanced" ng-change="glideraChange()">
-      <span class="toggle-label" translate>Enable Glidera Service</span>
-    </ion-toggle>
 
-    <ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()">
-      <span class="toggle-label" translate>Enable Coinbase Service</span>
-    </ion-toggle>
-    </div>
-    <div class="item item-divider">
-      Others
-    </div>
-    <div class="list">
+      <div ng-show="usePushNotifications && PNEnabledByUser">
+        <div class="item item-divider">Notifications</div>
+
+        <ion-toggle ng-model="pushNotifications" toggle-class="toggle-balanced" ng-change="pushNotificationsChange()">
+          <span class="toggle-label" translate>Enable push notifications</span>
+        </ion-toggle>
+
+        <div ng-show="usePushNotifications && !PNEnabledByUser && isIOSApp">
+          <div translate>Push notifications for Copay are currently disabled. Enable them in the Settings app.</div>
+          <ul ng-click="openSettings()">
+            <li translate>Open Settings app</li>
+          </ul>
+        </div>
+      </div>
+
+      <div class="item item-divider">Exchanges</div>
+
+      <ion-toggle ng-show="!isWP" ng-model="glideraEnabled" toggle-class="toggle-balanced" ng-change="glideraChange()">
+        <span class="toggle-label" translate>Enable Glidera Service</span>
+      </ion-toggle>
+
+      <ion-toggle ng-show="!isWP" ng-model="coinbaseEnabled" toggle-class="toggle-balanced" ng-change="coinbaseChange()">
+        <span class="toggle-label" translate>Enable Coinbase Service</span>
+      </ion-toggle>
+
+      <div class="item item-divider">Others</div>
+
       <ion-toggle ng-model="spendUnconfirmed" toggle-class="toggle-balanced" ng-change="spendUnconfirmedChange()">
         <span class="toggle-label" translate>Use Unconfirmed Funds</span>
       </ion-toggle>
+
       <div class="item item-icon-left" href ui-sref="settings.about">
         <i class="icon ion-ios-film-outline"></i>
         <span translate>About Copay</span>
diff --git a/src/sass/main.scss b/src/sass/main.scss
index 44ce5fa39..4683eb09f 100644
--- a/src/sass/main.scss
+++ b/src/sass/main.scss
@@ -415,6 +415,10 @@ ul.wallet-selection.wallets {
   }
 }
 
+.scroll {
+  padding-bottom: 35px;
+}
+
 // History
 .updatingHistory {
   div {