diff --git a/src/js/controllers/walletDetails.js b/src/js/controllers/walletDetails.js
index 2436da730..c824cbfda 100644
--- a/src/js/controllers/walletDetails.js
+++ b/src/js/controllers/walletDetails.js
@@ -483,7 +483,14 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
   function rgbToHex(r, g, b) {
     return "#" + componentToHex(r) + componentToHex(g) + componentToHex(b);
   }
-
+  $scope.goToSend = function() {
+    $state.go('tabs.home', {
+      walletId: $scope.wallet.id
+    }).then(function () {
+      $ionicHistory.clearHistory();
+      $state.go('tabs.send');
+    });
+  };
   $scope.goToReceive = function() {
     $state.go('tabs.home', {
       walletId: $scope.wallet.id
@@ -494,4 +501,12 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
       });
     });
   };
+  $scope.goToBuy = function() {
+    $state.go('tabs.home', {
+      walletId: $scope.wallet.id
+    }).then(function () {
+      $ionicHistory.clearHistory();
+      $state.go('tabs.buyandsell');
+    });
+  };
 });
diff --git a/src/sass/views/tab-home.scss b/src/sass/views/tab-home.scss
index 680738a3b..708ff4fad 100644
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@@ -70,7 +70,7 @@
     }
   }
   .buttons {
-    margin: 6px auto 0px;
+    margin: 6px auto -12px;
     max-width: 600px;
     >.col {
       padding: 5px 10px;
@@ -84,8 +84,8 @@
       width: 100%;
       font-size: 19px;
       font-weight: bolder;
-      min-height: 45px;
-      line-height: 45px;
+      min-height: auto;
+      line-height: 36px;
     }
   }
   .wallet-coin-logo {
diff --git a/src/sass/views/walletDetails.scss b/src/sass/views/walletDetails.scss
index d03530cbb..0536a5735 100644
--- a/src/sass/views/walletDetails.scss
+++ b/src/sass/views/walletDetails.scss
@@ -132,10 +132,6 @@
     position: relative;
     height: 100%;
     height: calc(100% - env(safe-area-inset-bottom) * 2);
-
-    &.status-bar {
-      margin-top: 20px;
-    }
   }
   .bar-header {
     border: 0;
@@ -191,9 +187,9 @@
       }
     }
 
-    .buttons {
+    .send-receive-buttons {
       max-width: 600px;
-      margin: 30px auto 0;
+      margin: 45px auto 0;
       >.col {
         padding: 5px 10px;
         margin-bottom: 0;
@@ -206,8 +202,8 @@
         width: 100%;
         font-size: 19px;
         font-weight: bolder;
-        min-height: 40px;
-        line-height: 40px;
+        min-height: auto;
+        line-height: 36px;
       }
     }
   }
diff --git a/www/views/walletDetails.html b/www/views/walletDetails.html
index 2da69fb6e..85aace8fc 100644
--- a/www/views/walletDetails.html
+++ b/www/views/walletDetails.html
@@ -90,21 +90,23 @@
           </span>
         </button>
       </div>
-      <div class="buttons row" ng-style="{opacity: buttonsOpacity}">
+
+      <div class="send-receive-buttons row" ng-if="status.availableBalanceSat || status.availableBalanceSat === 0" ng-style="{opacity: buttonsOpacity}">
         <div class="col">
           <div class="button button-outline button-white-outline" ng-click="goToReceive()">
             <span translate>Receive</span>
           </div>
         </div>
         <div class="col">
-          <div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ui-sref="tabs.buyandsell">
+          <div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ng-click="goToBuy()">
             <span translate>Buy Bitcoin</span>
           </div>
-          <div class="button  button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ui-sref="tabs.send">
+          <div class="button  button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ng-click="goToSend()">
             <span translate>Send</span>
           </div>
         </div>
       </div>
+
     </div>
     <div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
       <span ng-include="'views/includes/walletInfo.html'"></span>
@@ -212,6 +214,22 @@
         </button>
       </div>
 
+      <div class="send-receive-buttons row" ng-style="{opacity: buttonsOpacity}">
+        <div class="col">
+          <div class="button button-outline button-white-outline" ng-click="goToReceive()">
+            <span translate>Receive</span>
+          </div>
+        </div>
+        <div class="col">
+          <div class="button button-outline button-white-outline" ng-if="!status.availableBalanceSat" ui-sref="tabs.buyandsell">
+            <span translate>Buy Bitcoin</span>
+          </div>
+          <div class="button  button-outline button-white-outline" ng-if="status.availableBalanceSat>0" ui-sref="tabs.send">
+            <span translate>Send</span>
+          </div>
+        </div>
+      </div>
+
     </div>
     <div class="wallet-details-wallet-info" ng-style="{opacity: altAmountOpacity}">
       <span ng-include="'views/includes/walletInfo.html'"></span>