diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index a3881b719..a7f6187a8 100644
--- a/src/js/controllers/advancedSettings.js
+++ b/src/js/controllers/advancedSettings.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $timeout, $state, $log, $window, $ionicModal, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService, storageService, $ionicHistory, $ionicScrollDelegate, pincodeService) {
+angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $timeout, $state, $log, $window, $ionicModal, lodash, configService, uxLanguage, platformInfo, pushNotificationsService, profileService, feeService, storageService, $ionicHistory, $ionicScrollDelegate) {
 
   var updateConfig = function() {
     var config = configService.getSync();
diff --git a/src/js/controllers/pincode.js b/src/js/controllers/pincode.js
index dc83d1c50..c2ba22363 100644
--- a/src/js/controllers/pincode.js
+++ b/src/js/controllers/pincode.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('pincodeController', function($state, $stateParams, $timeout, $scope, $log, $window, configService) {
+angular.module('copayApp.controllers').controller('pincodeController', function($state, $stateParams, $ionicHistory, $timeout, $scope, $log, $window, configService) {
 
   $scope.$on("$ionicView.beforeEnter", function(event) {
     $scope.currentPincode = $scope.newPincode = '';
@@ -39,8 +39,7 @@ angular.module('copayApp.controllers').controller('pincodeController', function(
 
     if (!$scope.locking) {
       if (match) {
-        $scope.fromSettings ? saveSettings($scope.locking, '') : $scope.close();
-        return;
+        $scope.fromSettings ? saveSettings($scope.locking, '') : $scope.close(150);
       }
     } else {
       checkCodes();
@@ -70,14 +69,13 @@ angular.module('copayApp.controllers').controller('pincodeController', function(
 
     configService.set(opts, function(err) {
       if (err) $log.debug(err);
-      $timeout(function() {
-        $scope.close();
-      });
+      $scope.close();
     });
   };
 
-  $scope.close = function() {
-    if ($scope.fromSettings) $state.go('tabs.advanced');
-    else $state.go('tabs.home');
+  $scope.close = function(delay) {
+    $timeout(function() {
+      $ionicHistory.viewHistory().backView ? $ionicHistory.goBack() : $state.go('tabs.home');
+    }, delay || 1);
   };
 });
diff --git a/src/js/services/pincodeService.js b/src/js/services/pincodeService.js
deleted file mode 100644
index fea790bca..000000000
--- a/src/js/services/pincodeService.js
+++ /dev/null
@@ -1,26 +0,0 @@
-'use strict';
-
-angular.module('copayApp.services').factory('pincodeService', function($log, $rootScope, $ionicModal, configService) {
-  var root = {};
-
-  root.lockChange = function(opts) {
-    var scope = $rootScope.$new(true);
-    scope.fromSettings = opts.fromSettings;
-    scope.locking = opts.locking;
-    $ionicModal.fromTemplateUrl('views/modals/pincode.html', {
-      scope: scope,
-      backdropClickToClose: false,
-      hardwareBackButtonClose: false
-    }).then(function(modal) {
-      scope.pincodeModal = modal;
-      scope.pincodeModal.show();
-    });
-  };
-
-  root.isLocked = function() {
-    var config = configService.getSync();
-    return config.pincode ? config.pincode.enabled : false;
-  };
-
-  return root;
-});
diff --git a/src/sass/views/pincode.scss b/src/sass/views/pincode.scss
index d2a79c659..272591c21 100644
--- a/src/sass/views/pincode.scss
+++ b/src/sass/views/pincode.scss
@@ -11,10 +11,6 @@
     text-align: center;
     width: 100%;
     height: 100%;
-    .row .col {
-      margin: 10px;
-      height: 25px;
-    }
     .app-icon {
       margin-top: -55px;
       .big-icon-svg {
@@ -38,18 +34,15 @@
       }
     }
     .block-code {
-      width: 300px;
+      width: 120px;
       margin: auto;
-      padding: 0 50px 0 50px;
+      .row {
+        height: 35px;
+      }
     }
     .block-buttons {
-      .row {
-        padding: 3%;
-      }
-      @media (max-height: 480px) {
-        .row {
-          padding: 2%;
-        }
+      .col {
+        padding: 5%;
       }
       cursor: pointer;
       position: absolute;
@@ -63,9 +56,8 @@
   	border-radius: 50%;
   	opacity: 0.6;
   	box-shadow: 0 0 1px 0px rgb( 255, 255, 255);
-  	width: 5px;
-  	height: 5px;
-  	transition: background-color .1s ease-in-out;
+  	margin: 2px;
+  	transition: background-color .2s ease-in-out;
   }
   .filled {
   	background-color: #666666;