diff --git a/css/main.css b/css/main.css
index 5c748b33f..2aeac8172 100644
--- a/css/main.css
+++ b/css/main.css
@@ -635,3 +635,9 @@ ul.pagination li.current a:hover, ul.pagination li.current a:focus {
   color:white;
 }
 
+.input-note {
+  margin-top: -10px;
+  display: block;
+  margin-bottom: 1rem;
+}
+
diff --git a/index.html b/index.html
index 0ac3f6cfd..8d162de99 100644
--- a/index.html
+++ b/index.html
@@ -678,7 +678,6 @@
                   <div class="row collapse">
                     <label for="amount">Amount
                       <small ng-hide="!sendForm.amount.$pristine">required</small>
-                      <i class="fi-arrow-up" title="Send all funds" ng-click="topAmount()"></i>
                       <small class="is-valid" ng-show="!sendForm.amount.$invalid && !sendForm.amount.$pristine">Valid</small>
                       <small class="has-error" ng-show="sendForm.amount.$invalid && !sendForm.amount.$pristine && !notEnoughAmount">
                         Not valid
@@ -691,6 +690,11 @@
                       min="0.0001" max="10000000000" enough-amount required
                       autocomplete="off"
                       >
+                      <a class="small input-note" title="Send all funds"
+                        ng-show="$root.availableBalance > 0" 
+                        ng-click="topAmount(sendForm)">
+                        Use all funds ({{getAvailableAmount()}} {{$root.unitName}})
+                      </a>                      
                     </div>
                     <div class="small-3 columns">
                       <span class="postfix">{{$root.unitName}}</span>
diff --git a/js/controllers/send.js b/js/controllers/send.js
index 26c50f6aa..9d4e96cb3 100644
--- a/js/controllers/send.js
+++ b/js/controllers/send.js
@@ -267,8 +267,12 @@ angular.module('copayApp.controllers').controller('SendController',
       });
     };
 
-    $scope.topAmount = function() {
-      var maxSat = ($rootScope.availableBalance * config.unitToSatoshi).toFixed(0) - bitcore.TransactionBuilder.FEE_PER_1000B_SAT;
-      $scope.amount = maxSat / config.unitToSatoshi;
+    $scope.getAvailableAmount = function() {
+      return ((($rootScope.availableBalance * config.unitToSatoshi).toFixed(0) - bitcore.TransactionBuilder.FEE_PER_1000B_SAT) / config.unitToSatoshi);
+    };
+
+    $scope.topAmount = function(form) {
+      $scope.amount = $scope.getAvailableAmount();      
+      form.amount.$pristine = false;
     };
   });