diff --git a/js/controllers/copayers.js b/js/controllers/copayers.js
index c6a9c2c54..5e18c6366 100644
--- a/js/controllers/copayers.js
+++ b/js/controllers/copayers.js
@@ -15,7 +15,7 @@ angular.module('copayApp.controllers').controller('CopayersController',
     }
 
     $scope.goToWallet = function() {
-      $location.path('/addresses');
+      $location.path('/receive');
     };
 
   });
diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js
index 6935ec03f..54b236cee 100644
--- a/js/controllers/sidebar.js
+++ b/js/controllers/sidebar.js
@@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('SidebarController',
     $scope.menu = [{
       'title': 'Receive',
       'icon': 'fi-arrow-left',
-      'link': 'addresses'
+      'link': 'receive'
     }, {
       'title': 'Send',
       'icon': 'fi-arrow-right',
@@ -16,7 +16,7 @@ angular.module('copayApp.controllers').controller('SidebarController',
     }, {
       'title': 'History',
       'icon': 'fi-clipboard-pencil',
-      'link': 'transactions'
+      'link': 'history'
     }, {
       'title': 'More',
       'icon': 'fi-download',
diff --git a/js/routes.js b/js/routes.js
index 00ab8b185..712bbda17 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -30,11 +30,11 @@ angular
         templateUrl: 'views/copayers.html',
         validate: true
       })
-      .when('/addresses', {
+      .when('/receive', {
         templateUrl: 'views/addresses.html',
         validate: true
       })
-      .when('/transactions', {
+      .when('/history', {
         templateUrl: 'views/transactions.html',
         validate: true
       })
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index fbc5316f9..6b1587ad8 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -51,7 +51,7 @@ angular.module('copayApp.services')
       });
       wallet.on('serverError', function(m) {
         var message = m || 'The PeerJS server is not responding, please try again';
-        $location.path('addresses');
+        $location.path('receive');
         root.onErrorDigest($scope, message);
       });
       wallet.on('ready', function() {
@@ -123,7 +123,7 @@ angular.module('copayApp.services')
         if ($rootScope.pendingPayment) {
           $location.path('send');
         } else {
-          $location.path('addresses');
+          $location.path('receive');
         }
         if (!config.disableVideo)
           video.setOwnPeer(myPeerID, w, handlePeerVideo);
diff --git a/views/includes/sidebar-mobile.html b/views/includes/sidebar-mobile.html
index cc1cb0b53..6c5b43d47 100644
--- a/views/includes/sidebar-mobile.html
+++ b/views/includes/sidebar-mobile.html
@@ -1,7 +1,7 @@
 <div ng-controller="SidebarController">
   <header class="text-center">
     <div class="text-white m10v">
-      <a href="#!/addresses" class="db">
+      <a href="#!/receive" class="db">
         <img src="img/logo-negative-beta.svg" alt="" width="80">
       </a>
       <small>v{{version}}</small>
diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html
index 3852fc2f7..b6014468a 100644
--- a/views/includes/sidebar.html
+++ b/views/includes/sidebar.html
@@ -1,7 +1,7 @@
 <div ng-controller="SidebarController">
   <header class="p20">
     <div class="text-center">
-      <a href="#!/addresses" class="db">
+      <a href="#!/receive" class="db">
         <img src="img/logo-negative-beta.svg" alt="" width="100">
       </a>
       <div>
@@ -12,7 +12,7 @@
     </div>
     <div class="line-sidebar"></div>
     <div>
-      <a href="#!/addresses" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
+      <a href="#!/receive" class="name-wallet" tooltip-placement="bottom" tooltip="ID: {{$root.wallet.id}}">
         <span>{{$root.wallet.getName()}}</span>
       </a>
       <a class="button gray small side-bar right" title="Manual Refresh"
diff --git a/views/includes/transaction.html b/views/includes/transaction.html
index 420f84470..874907aba 100644
--- a/views/includes/transaction.html
+++ b/views/includes/transaction.html
@@ -32,7 +32,7 @@
 
 <div class="last-transactions-content">
   <div class="box-copayer" ng-repeat="c in tx.actionList">
-    <a href="#!/transactions" class="has-tip">
+    <a class="has-tip">
       <img class="copayer-ico br100" src="./img/satoshi.gif" alt="{{c.cId}}">
     </a>
     <div class="box-status">
@@ -54,7 +54,7 @@
           <i class="fi-check icon-status icon-active-check"></i>
       </a>
 
-      <a ng-if="!c.actions.sign && !c.actions.rejected" href="#!/transactions" class="icon-status">
+      <a ng-if="!c.actions.sign && !c.actions.rejected" class="icon-status">
           <i class="fi-loop icon-rotate"></i>
       </a>
     </div>