diff --git a/src/js/controllers/pincode.js b/src/js/controllers/pincode.js
index 911c5cd91..dc83d1c50 100644
--- a/src/js/controllers/pincode.js
+++ b/src/js/controllers/pincode.js
@@ -28,9 +28,7 @@ angular.module('copayApp.controllers').controller('pincodeController', function(
       $scope.$apply();
     });
     if (!$scope.locking && isComplete()) {
-      $timeout(function() {
-        $scope.save();
-      });
+      $scope.save();
     }
   };
 
@@ -72,7 +70,9 @@ angular.module('copayApp.controllers').controller('pincodeController', function(
 
     configService.set(opts, function(err) {
       if (err) $log.debug(err);
-      $scope.close();
+      $timeout(function() {
+        $scope.close();
+      });
     });
   };
 
diff --git a/src/sass/views/pincode.scss b/src/sass/views/pincode.scss
index eeb7bd068..d2a79c659 100644
--- a/src/sass/views/pincode.scss
+++ b/src/sass/views/pincode.scss
@@ -3,6 +3,9 @@
   .bar.bar-clear {
     background-color: transparent;
     border: none;
+    .back-button .icon:before {
+      color: #2d3f50;
+    }
   }
   .content {
     text-align: center;
@@ -62,7 +65,7 @@
   	box-shadow: 0 0 1px 0px rgb( 255, 255, 255);
   	width: 5px;
   	height: 5px;
-  	transition: background-color .5s ease-in-out;
+  	transition: background-color .1s ease-in-out;
   }
   .filled {
   	background-color: #666666;