diff --git a/public/views/add.html b/public/views/add.html
index 4b24c8da7..491830b33 100644
--- a/public/views/add.html
+++ b/public/views/add.html
@@ -12,17 +12,17 @@
     <ion-list>
       <a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.create">
         <h2 translate>Create new wallet</h2>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.join">
         <h2 translate>Join shared wallet</h2>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <a class="item item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="tabs.import.phrase">
         <h2 translate>Import wallet</h2>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
     </ion-list>
 
diff --git a/public/views/amazon.html b/public/views/amazon.html
index d32c8cca9..49edf5f46 100644
--- a/public/views/amazon.html
+++ b/public/views/amazon.html
@@ -36,7 +36,7 @@
         <a class="item item-icon-left item-icon-right" href ui-sref="amazon.buy">
           <i class="icon ion-bag"></i>
           Buy Gift Card
-          <i class="icon ion-ios-arrow-right"></i>
+          <i class="icon nav-item-arrow-right"></i>
         </a>
       </div>
 
diff --git a/public/views/glidera.html b/public/views/glidera.html
index 038a5d5f0..4933fa584 100644
--- a/public/views/glidera.html
+++ b/public/views/glidera.html
@@ -90,7 +90,7 @@
           <span class="item-note" ng-show="email">
             {{email}}
           </span>
-          <i class="icon ion-ios-arrow-right"></i>
+          <i class="icon nav-item-arrow-right"></i>
         </a>
       </div>
       <div class="padding">
@@ -115,14 +115,14 @@
             href ui-sref="glidera.buy">
           <img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="35">
           Buy Bitcoin
-          <i class="icon ion-ios-arrow-right"></i>
+          <i class="icon nav-item-arrow-right"></i>
         </a>
         <a class="item item-icon-right"
             ng-show="status.userCanSell"
             href ui-sref="glidera.sell">
           <img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="35">
           Sell Bitcoin
-          <i class="icon ion-ios-arrow-right"></i>
+          <i class="icon nav-item-arrow-right"></i>
         </a>
       </div>
 
diff --git a/public/views/preferences.html b/public/views/preferences.html
index 446951fcc..fa1b74027 100644
--- a/public/views/preferences.html
+++ b/public/views/preferences.html
@@ -12,7 +12,7 @@
         <span class="item-note">
           {{wallet.name}}
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item" ng-show="wallet.isPrivKeyExternal()">
         <span translate>Hardware Wallet</span>
@@ -25,7 +25,7 @@
         <span class="item-note" ng-style="{'color': wallet.color}">
           &block;
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-right" ui-sref="tabs.preferences.preferencesEmail">
         <span translate>Email Notifications</span>
@@ -33,14 +33,14 @@
           <span ng-if="!wallet.email" translate>Disabled</span>
           <span ng-if="wallet.email">{{wallet.email}}</span>
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <div class="item item-divider" translate>
         Security
       </div>
       <a class="item item-icon-right" ui-sref="tabs.preferences.backup" ng-hide="wallet.isPrivKeyExternal()">
         <span translate>Backup</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <div ng-show="wallet.canSign()">
         <ion-toggle ng-model="encryptEnabled" toggle-class="toggle-balanced" ng-change="encryptChange()">
@@ -54,12 +54,12 @@
       </div>
       <a class="item item-icon-right" ui-sref="tabs.preferences.deleteWords" ng-show ="!deleted">
         <span translate>Delete recovery phrase</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <div class="item item-divider"></div>
       <a class="item item-icon-right" ui-sref="tabs.preferences.preferencesAdvanced">
         <span translate>Advanced</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
     </div>
   </ion-content>
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html
index 8857bf1b1..ce5d07776 100644
--- a/public/views/preferencesAbout.html
+++ b/public/views/preferencesAbout.html
@@ -30,17 +30,17 @@
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.termsOfUse">
         <i class="icon ion-ios-list-outline"></i>
         <span translate>Terms of Use</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.translators">
         <i class="icon ion-ios-people-outline"></i>
         <span translate>Translators</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.logs">
         <i class="icon ion-ios-copy-outline"></i>
         <span translate>Session log</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
     </div>
   </ion-content>
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html
index 2471f9a17..e2a87c140 100644
--- a/public/views/preferencesAdvanced.html
+++ b/public/views/preferencesAdvanced.html
@@ -11,27 +11,27 @@
       </div>
       <a class="item item-icon-right" ui-sref="tabs.preferences.information">
         <span translate>Wallet Information</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-right" ng-show="index.network == 'livenet'" ui-sref="tabs.preferences.paperWallet">
         <span translate>Sweep paper wallet</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-right" ui-sref="tabs.preferences.export.file">
         <span translate>Export Wallet</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-right" ui-sref="tabs.preferences.preferencesBwsUrl">
         <span translate>Wallet Service URL</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-right" ui-sref="tabs.preferences.preferencesHistory">
         <span translate>Transaction History</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a class="item item-icon-right" ui-sref="tabs.preferences.delete">
         <span translate>Delete Wallet</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
     </div>
   </ion-content>
diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html
index a0b9a9aee..6e64f2fce 100644
--- a/public/views/tab-export-file.html
+++ b/public/views/tab-export-file.html
@@ -17,16 +17,14 @@
       </div>
 
       <form name="exportForm" novalidate>
-        <div class="list">
-          <label class="item item-input item-stacked-label">
-            <span class="input-label" transalate>Set up a password</span>
-            <input type="password" placeholder="{{'Your password'|translate}}" name="password" ng-model="password">
-          </label>
-          <label class="item item-input item-stacked-label">
-            <span class="input-label" transalate>Repeat the password</span>
-            <input type="password" class="form-control" placeholder="{{'Repeat password'|translate}}" name="password" ng-model="repeatpassword">
-          </label>
-        </div>
+        <label class="item item-input item-stacked-label">
+          <span class="input-label" transalate>Set up a password</span>
+          <input type="password" placeholder="{{'Your password'|translate}}" name="password" ng-model="password">
+        </label>
+        <label class="item item-input item-stacked-label">
+          <span class="input-label" transalate>Repeat the password</span>
+          <input type="password" class="form-control" placeholder="{{'Repeat password'|translate}}" name="password" ng-model="repeatpassword">
+        </label>
       </form>
 
       <ion-toggle ng-show="canSign" ng-model="showAdvanced" toggle-class="toggle-balanced">
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 2d825d7d2..a31f00002 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -9,7 +9,7 @@
     <div class="list card" ng-hide="!txps[0]">
       <a class="item item-icon-right item-heading" ui-sref="tabs.proposals" translate>
         Payment Proposals
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
 
         <span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
       </a>
@@ -22,7 +22,7 @@
     <div class="list card">
       <a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
         Recent Activity
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <span ng-if="fetchingNotifications" class="item text-center">
         <ion-spinner icon="lines"></ion-spinner>
@@ -57,7 +57,7 @@
         <p ng-show="wallet.isComplete() && wallet.balanceHidden">
           <strong class="size-12" translate>[Balance Hidden]</strong>
         </p>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a ui-sref="bitpayCard.main" ng-show="externalServices.BitpayCard" class="item item-icon-left">
         <i class="icon ion-card"></i>
@@ -92,28 +92,28 @@
          <img class="icon-create-wallet"/>
        </i>
         <span translate>Create a bitcoin wallet</span>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a ng-show="!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right">
        <i class="icon big-icon-svg">
          <img class="icon-buy-bitcoin"/>
        </i>
         <span translate>Buy Bitcoin</span>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a ui-sref="bitpayCard.main" ng-show="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right">
        <i class="icon big-icon-svg">
          <img class="icon-bitpay-card"/>
        </i>
         <span translate>Add BitPay Card</span>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
       <a ui-sref="amazon.main" ng-show="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right">
         <i class="icon big-icon-svg">
           <img class="icon-gift"/>
         </i>
         <span translate>Add Amazon Gift Card</span>
-        <i class="icon ion-ios-arrow-right nav-item-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
     </div>
 
diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index c462d950d..f7d2942a1 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -9,7 +9,7 @@
       <a class="item item-icon-left item-icon-right" ng-click="openAddressbookModal()">
         <i class="icon ion-ios-book-outline"></i>
         <span translate>Address Book</span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <div class="item item-divider" translate>Preferences</div>
@@ -20,7 +20,7 @@
         <span class="item-note">
           {{currentLanguageName|translate}}
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.unit">
@@ -29,7 +29,7 @@
         <span class="item-note">
           {{unitName}}
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.altCurrency">
@@ -38,7 +38,7 @@
         <span class="item-note">
           {{selectedAlternative.name}}
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <a class="item item-icon-left item-icon-right" ui-sref="tabs.fee">
@@ -47,7 +47,7 @@
         <span class="item-note">
           {{feeOpts[currentFeeLevel]|translate}}
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <div ng-show="usePushNotifications && PNEnabledByUser">
@@ -96,14 +96,14 @@
         <span class="badge badge-assertive" ng-show="!item.isComplete()" translate>
           Incomplete
         </span>
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
 
       <div class="item item-divider"></div>
       <a class="item item-icon-left item-icon-right" href ui-sref="tabs.about">
         <i class="icon ion-ios-information-outline"></i>
         <span translate>About</span> {{appName}}
-        <i class="icon ion-ios-arrow-right"></i>
+        <i class="icon nav-item-arrow-right"></i>
       </a>
     </div>
   </ion-content>
diff --git a/src/sass/common.scss b/src/sass/common.scss
index 9350009f1..34ab2e428 100644
--- a/src/sass/common.scss
+++ b/src/sass/common.scss
@@ -1,6 +1,7 @@
 .icon.nav-item-arrow-right {
   color: #666;
   font-size: 26px;
+  @extend .ion-ios-arrow-right;
 }
 
 .item.item-heading {