diff --git a/src/js/controllers/advancedSettings.js b/src/js/controllers/advancedSettings.js
index 1617ef9fe..5b213b053 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, $log, configService, platformInfo) {
+angular.module('copayApp.controllers').controller('advancedSettingsController', function($scope, $log, configService) {
 
   var updateConfig = function() {
     var config = configService.getSync();
@@ -50,8 +50,6 @@ angular.module('copayApp.controllers').controller('advancedSettingsController',
   };
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
-    $scope.isCordova = platformInfo.isCordova;
-    $scope.isDevel = platformInfo.isDevel;
     updateConfig();
   });
 
diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js
index ca350bc51..00a58359b 100644
--- a/src/js/controllers/tab-settings.js
+++ b/src/js/controllers/tab-settings.js
@@ -51,7 +51,12 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
 
   $scope.$on("$ionicView.beforeEnter", function(event, data) {
     $scope.isCordova = platformInfo.isCordova;
+    $scope.isDevel = platformInfo.isDevel;
     $scope.appName = appConfigService.nameCase;
+    configService.whenAvailable(function(config) {
+      $scope.locked = config.lock.method == 'fingerprint' || config.lock.value || false;
+      $scope.method = config.lock.method != '' ? config.lock.method.charAt(0).toUpperCase() + config.lock.method.slice(1) : gettextCatalog.getString('Disabled');
+    });
   });
 
   $scope.$on("$ionicView.enter", function(event, data) {
diff --git a/www/views/advancedSettings.html b/www/views/advancedSettings.html
index 74cf47341..7181505f8 100644
--- a/www/views/advancedSettings.html
+++ b/www/views/advancedSettings.html
@@ -28,15 +28,6 @@
       <ion-toggle ng-model="hideNextSteps.value" toggle-class="toggle-balanced" ng-change="nextStepsChange()">
         <span class="toggle-label" translate>Hide Next Steps Card</span>
       </ion-toggle>
-
-      <div ng-if="isCordova || isDevel">
-        <div class="item item-divider"></div>
-
-        <a class="item item-icon-right" ui-sref="tabs.lock">
-          <span translate>Lock App</span>
-          <i class="icon bp-arrow-right"></i>
-        </a>
-      </div>
     </div>
   </ion-content>
 </ion-view>
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html
index b12ab2b5d..e0bbe0e0e 100644
--- a/www/views/tab-settings.html
+++ b/www/views/tab-settings.html
@@ -89,6 +89,16 @@
         <i class="icon bp-arrow-right"></i>
       </a>
 
+      <a class="item has-setting-value item-icon-left item-icon-right" ui-sref="tabs.lock" ng-if="isCordova || isDevel">
+        <i class="icon ion-ios-locked-outline" ng-if="locked"></i>
+        <i class="icon ion-ios-unlocked-outline" ng-if="!locked"></i>
+        <span class="setting-title">{{'Lock App' | translate}}</span>
+        <span class="setting-value">
+          {{method}}
+        </span>
+        <i class="icon bp-arrow-right"></i>
+      </a>
+
       <div class="item item-divider" ng-show="wallets[0]">{{'Wallets & Integrations' | translate}}</div>
 
       <a class="item item-icon-left item-icon-right" href