diff --git a/public/views/preferencesLogs.html b/public/views/preferencesLogs.html
index 6a907c3f9..6cc354449 100644
--- a/public/views/preferencesLogs.html
+++ b/public/views/preferencesLogs.html
@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Session log</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="about">
+      <button class="button no-border" ui-sref="settings.about">
         <i class="icon ion-chevron-left"></i> Back
       </button>
     </ion-nav-buttons>
diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html
index de055d49d..f3f812204 100644
--- a/public/views/tab-settings.html
+++ b/public/views/tab-settings.html
@@ -10,7 +10,7 @@
         <i class="icon ion-ios-book-outline"></i>
         <span translate>Address Book</span>
       </div>
-      <div class="item item-icon-left" href ui-sref="feedback">
+      <div class="item item-icon-left" href ui-sref="settings.feedback">
         <i class="icon ion-ios-heart-outline"></i>
         <span translate>Feedback</span>
       </div>
diff --git a/public/views/termOfUse.html b/public/views/termOfUse.html
index 4291ed0c7..f98907319 100644
--- a/public/views/termOfUse.html
+++ b/public/views/termOfUse.html
@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Terms of Use</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="about">
+      <button class="button no-border" ui-sref="settings.about">
         <i class="icon ion-chevron-left"></i> Back
       </button>
     </ion-nav-buttons>
diff --git a/public/views/translators.html b/public/views/translators.html
index 388c27cd7..da8c182cd 100644
--- a/public/views/translators.html
+++ b/public/views/translators.html
@@ -2,7 +2,7 @@
   <ion-nav-bar class="bar-stable">
     <ion-nav-title>Translators</ion-nav-title>
     <ion-nav-buttons side="primary">
-      <button class="button no-border" ui-sref="about">
+      <button class="button no-border" ui-sref="settings.about">
         <i class="icon ion-chevron-left"></i> Back
       </button>
     </ion-nav-buttons>
diff --git a/src/js/controllers/preferencesAltCurrency.js b/src/js/controllers/preferencesAltCurrency.js
index 20bdb53c9..290e5187b 100644
--- a/src/js/controllers/preferencesAltCurrency.js
+++ b/src/js/controllers/preferencesAltCurrency.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesAltCurrencyController',
-  function($scope, $log, $timeout, configService, rateService, lodash, profileService, walletService, $state) {
+  function($scope, $log, $state, $timeout, configService, rateService, lodash, profileService, walletService) {
 
     var next = 10;
     var completeAlternativeList;
@@ -42,9 +42,9 @@ angular.module('copayApp.controllers').controller('preferencesAltCurrencyControl
 
       configService.set(opts, function(err) {
         if (err) $log.warn(err);
-        $state.go('preferencesGlobal');
-        $scope.$emit('Local/UnitSettingUpdated');
-        walletService.updateRemotePreferences(profileService.getClients(), {}, function() {
+        $state.go('tabs.settings');
+
+        walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
           $log.debug('Remote preferences saved');
         });
       });
diff --git a/src/js/controllers/preferencesLanguage.js b/src/js/controllers/preferencesLanguage.js
index 2717d3e8e..1cd78702d 100644
--- a/src/js/controllers/preferencesLanguage.js
+++ b/src/js/controllers/preferencesLanguage.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('copayApp.controllers').controller('preferencesLanguageController',
-  function($scope, $log, $state, configService, profileService, uxLanguage, walletService, go) {
+  function($scope, $log, $state, configService, profileService, uxLanguage, walletService) {
 
     $scope.init = function() {
       $scope.availableLanguages = uxLanguage.getLanguages();
@@ -19,10 +19,10 @@ angular.module('copayApp.controllers').controller('preferencesLanguageController
 
       configService.set(opts, function(err) {
         if (err) $log.warn(err);
-        go.preferencesGlobal();
 
+        $state.go('tabs.settings')
         uxLanguage.update(function() {
-          walletService.updateRemotePreferences(profileService.getClients(), {}, function() {
+          walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
             $log.debug('Remote preferences saved');
           });
         });
diff --git a/src/js/controllers/preferencesUnit.js b/src/js/controllers/preferencesUnit.js
index b23f831cc..5fdc78aba 100644
--- a/src/js/controllers/preferencesUnit.js
+++ b/src/js/controllers/preferencesUnit.js
@@ -36,10 +36,8 @@ angular.module('copayApp.controllers').controller('preferencesUnitController', f
     configService.set(opts, function(err) {
       if (err) $log.warn(err);
 
-      $state.go('preferencesGlobal');
-      $scope.$emit('Local/UnitSettingUpdated');
-
-      walletService.updateRemotePreferences(profileService.getClients(), {}, function() {
+      $state.go('tabs.settings');
+      walletService.updateRemotePreferences(profileService.getWallets(), {}, function() {
         $log.debug('Remote preferences saved');
       });
     });
diff --git a/src/js/services/applicationService.js b/src/js/services/applicationService.js
index fd4b724af..b5e80e4ea 100644
--- a/src/js/services/applicationService.js
+++ b/src/js/services/applicationService.js
@@ -3,8 +3,8 @@ angular.module('copayApp.services')
   .factory('applicationService', function($rootScope, $timeout, platformInfo, $state) {
     var root = {};
 
-    var isChromeApp  = platformInfo.isChromeApp;
-    var isNW  = platformInfo.isNW;
+    var isChromeApp = platformInfo.isChromeApp;
+    var isNW = platformInfo.isNW;
 
     root.restart = function() {
       var hashIndex = window.location.href.indexOf('#/');