diff --git a/public/views/amazon.html b/public/views/amazon.html
index 49edf5f46..acc17ea58 100644
--- a/public/views/amazon.html
+++ b/public/views/amazon.html
@@ -1,11 +1,9 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-buttons side="primary">
-      <button class="button button-clear" ui-sref="tabs.home">
-        Close
-      </button>
-    </ion-nav-buttons>
-    <ion-nav-title>Gift cards</ion-nav-title>
+    <ion-nav-back-button>
+      <i class="icon ion-ios-arrow-thin-left"></i>
+    </ion-nav-back-button>
+    <ion-nav-title>Amazon.com Gift Cards</ion-nav-title>
   </ion-nav-bar>
 
   <ion-content ng-controller="amazonController as amazon" ng-init="amazon.init()">
@@ -21,7 +19,7 @@
 
     <div ng-if="!giftCards" class="m20t padding text-center">
 
-      <button class="button button-block button-positive" ui-sref="amazon.buy">
+      <button class="button button-block button-positive" ui-sref="tabs.giftcards.amazon.buy">
         Buy now
       </button>
 
@@ -33,7 +31,7 @@
 
     <div class="m20t" ng-if="giftCards">
       <div class="list">
-        <a class="item item-icon-left item-icon-right" href ui-sref="amazon.buy">
+        <a class="item item-icon-left item-icon-right" href ui-sref="tabs.giftcards.amazon.buy">
           <i class="icon ion-bag"></i>
           Buy Gift Card
           <i class="icon nav-item-arrow-right"></i>
diff --git a/public/views/buyAmazon.html b/public/views/buyAmazon.html
index cd5adc9c1..6fea44d8d 100644
--- a/public/views/buyAmazon.html
+++ b/public/views/buyAmazon.html
@@ -1,10 +1,8 @@
 <ion-view>
   <ion-nav-bar class="bar-royal">
-    <ion-nav-buttons side="primary">
-      <button class="button back-button" ui-sref="amazon.main">
-        <i class="icon ion-ios-arrow-thin-left"></i>
-      </button>
-    </ion-nav-buttons>
+    <ion-nav-back-button>
+      <i class="icon ion-ios-arrow-thin-left"></i>
+    </ion-nav-back-button>
     <ion-nav-title>Buy</ion-nav-title>
   </ion-nav-bar>
 
diff --git a/public/views/modals/amazon-card-details.html b/public/views/modals/amazon-card-details.html
index de0fa25ca..daf729be4 100644
--- a/public/views/modals/amazon-card-details.html
+++ b/public/views/modals/amazon-card-details.html
@@ -1,6 +1,6 @@
 <ion-modal-view ng-controller="amazonCardDetailsController">
   <ion-header-bar align-title="center" class="bar-royal">
-    <button class="button button-clear" ng-click="cancel()">
+    <button class="button button-back button-clear" ng-click="cancel()">
       Close
     </button>
     <h1 class="title">Details</h1>
diff --git a/public/views/tab-home.html b/public/views/tab-home.html
index 935b34bb7..4e366ef67 100644
--- a/public/views/tab-home.html
+++ b/public/views/tab-home.html
@@ -90,7 +90,7 @@
     </div>
 
     <div class="list card" ng-show="externalServices.AmazonGiftCards">
-      <a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="amazon.main">
+      <a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="tabs.giftcards.amazon">
         <i class="icon big-icon-svg">
           <div class="bg icon-gift"></div>
         </i>
@@ -125,7 +125,7 @@
         <span translate>Buy or Sell Bitcoin</span>
         <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 next-step">
+      <a ui-sref="tabs.giftcards.amazon" ng-show="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right next-step">
         <i class="icon big-icon-svg">
           <div class="bg icon-gift"></div>
         </i>
diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js
index 0a57242e5..fd228db45 100644
--- a/src/js/controllers/buyAmazon.js
+++ b/src/js/controllers/buyAmazon.js
@@ -208,7 +208,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
           $log.debug("Saving new gift card with status: " + newData.status);
 
           self.giftCard = newData;
-          if (newData.status == 'PENDING') $state.transitionTo('amazon.main');
+          if (newData.status == 'PENDING') $state.transitionTo('tabs.giftcards.amazon');
           $timeout(function() {
             $scope.$digest();
           });
diff --git a/src/js/routes.js b/src/js/routes.js
index c520854c3..33435e551 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -710,30 +710,35 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         templateUrl: 'views/sellCoinbase.html'
       })
 
+      /*
+       *
+       * Gift Cards
+       *
+       */
 
-    /*
-     *
-     * Amazon Gift Card
-     *
-     */
-
-    .state('amazon', {
-        url: '/amazon',
-        abstract: true,
-        template: '<ion-nav-view name="amazon"></ion-nav-view>'
+      .state('tabs.giftcards', {
+        url: '/giftcards',
+        abstract: true
       })
-      .state('amazon.main', {
-        url: '/main',
+
+      /*
+       *
+       * Amazon.com Gift Card
+       *
+       */
+
+      .state('tabs.giftcards.amazon', {
+        url: '/amazon',
         views: {
-          'amazon': {
+          'tab-home@tabs': {
             templateUrl: 'views/amazon.html'
           }
         }
       })
-      .state('amazon.buy', {
+      .state('tabs.giftcards.amazon.buy', {
         url: '/buy',
         views: {
-          'amazon': {
+          'tab-home@tabs': {
             templateUrl: 'views/buyAmazon.html'
           }
         }