diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index ca32c6ac4..bf4d3506a 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -305,7 +305,8 @@
 
             &.very-long {
               input, .unit, .primary-amount-display {
-                font-size: 0.9em;
+                font-size: 1.2em; // OK for iPhone 5 / SE with BCH to 8dp
+                
   
                 @media (min-width: 375px) {
                   font-size: 1.3em;
@@ -382,41 +383,46 @@
 
       .available-funds {
         color: #6F6F70;
+        text-align: left;
+      }
+
+      .change-currency {
+        text-align: right;
       }
 
       .warning {
         color: $v-warning-color-2;
       }
 
-      .extra,
-      button.extra {
-        /*display: flex;*/
-        flex: 0 1 auto;
-      }
-
-      button.extra {
-        background: none; 
-        border: none;
-        color: #000;
-        font-family: 'ProximaNova';
-        font-size: 14px;
+      .extra {
+        flex: 1;
         line-height: normal;
-        min-height: auto;
-        min-width: auto;
-        padding: 0;
-      }
 
-      .button .icon:before {
-        font-size: 14px;
-        line-height: normal;
-      }
-      
+        .button {
+          background: none; 
+          border: none;
+          border-radius: 0;
+          color: #000;
+          font-family: 'ProximaNova';
+          font-size: 14px;
+          line-height: normal;
+          min-height: auto;
+          min-width: auto;
+          padding: 0;
+        }
 
-      .button {
-        span {
-          display: flex;
-          align-items: center;
-          justify-content: center;
+        .button .icon:before {
+          font-size: 14px;
+          line-height: normal;
+        }
+        
+
+        .button {
+          span {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+          }
         }
       }
     }
diff --git a/www/views/amount.html b/www/views/amount.html
index ab56052ab..b69431b6b 100644
--- a/www/views/amount.html
+++ b/www/views/amount.html
@@ -14,14 +14,14 @@
           <div class="send-amount-tool">
             <div class="send-amount-tool-input amount">
               <div class="primary-amount"
-                ng-class="{long: vm.amount.length > 5, 'very-long': vm.amount.length > 10}">
+                ng-class="{long: vm.amount.length > 5, 'very-long': vm.amount.length > 8}">
                 <span class="primary-amount-display text-selectable">
                   {{vm.amount || '0'}} {{vm.unit}}
                 </span>
               </div>
               <span ng-show="vm.globalResult"><formatted-amount value="{{vm.globalResult}}" currency="{{vm.unit}}"></formatted-amount></span>
               <div class="alternative-amount">
-                {{vm.alternativeAmount || '0.00'}} {{vm.alternativeUnit}}
+                <span class="text-selectable">{{vm.alternativeAmount || '0.00'}} {{vm.alternativeUnit}}</span>
               </div>
               <div class="switch-currencies" ng-click="vm.changeUnit()"><img src="img/icon-convert.svg"></div>
             </div>
@@ -34,17 +34,20 @@
         </div>
 
         <div class="send-amount-extras text-center">
-          <button class="extra button" ng-click="vm.openPopup()">
-            <span>
-              <img src="img/icon-alternative-currency-black.svg"/>
-              <pre> </pre>
-              <span translate>Change Currency</span>
-            </span>
-          </button>
-          <div class="extra available-funds" 
+          <div class="extra change-currency">
+            <button class="button" ng-click="vm.openPopup()">
+              <span>
+                <img src="img/icon-alternative-currency-black.svg"/>
+                <pre> </pre>
+                <span translate>Change Currency</span>
+              </span>
+            </button>
+          </div>
+          <div class="extra available-funds"
             ng-class="{warning: vm.fundsAreInsufficient}"
             ng-if="!vm.isRequestingSpecificAmount" translate>
-            <span>Available Funds: </span><span><formatted-amount value="{{vm.availableFunds}}" size-equal="true"></formatted-amount></span>
+              <span>Available Funds: </span><span><formatted-amount value="{{vm.availableFunds}}" size-equal="true"></formatted-amount></span>
+            </div>
           </div>  
         </div>
       </div>