diff --git a/www/js/controllers/currency-controllers.js b/www/js/controllers/currency-controllers.js
index e5b21348aee2a73b4f1da59ecf49d623261c04f4..48024dfe3995d9e83606ac36202b6a0ecdbee7d7 100644
--- a/www/js/controllers/currency-controllers.js
+++ b/www/js/controllers/currency-controllers.js
@@ -17,7 +17,7 @@ angular.module('cesium.currency.controllers', ['cesium.services'])
     })
 
     .state('app.currency_name', {
-      url: "/currency/:name",
+      url: "/currencies/:name",
       views: {
         'menuContent': {
           templateUrl: "templates/currency/view_currency.html",
diff --git a/www/js/controllers/network-controllers.js b/www/js/controllers/network-controllers.js
index fdcddc47042ee887b1c99e61056c5495c0756205..603794c658deac0f6c144e7dcba30cc69ee0c659 100644
--- a/www/js/controllers/network-controllers.js
+++ b/www/js/controllers/network-controllers.js
@@ -42,6 +42,7 @@ function NetworkLookupController($scope, $timeout, $state, $ionicHistory, $ionic
 
   $scope.networkStarted = false;
   $scope.ionItemClass = '';
+  $scope.expertMode = csSettings.expertMode && !UIUtils.screen.isSmall();
   $scope.search = {
     text: '',
     loading: true,
@@ -273,7 +274,7 @@ function NetworkLookupModalController($scope, $timeout, $state, $location, $ioni
   $scope.enableFilter = angular.isDefined(parameters.enableFilter) ? parameters.enableFilter : true;
   $scope.search.type = angular.isDefined(parameters.type) ? parameters.type : $scope.search.type;
   $scope.search.endpointFilter = angular.isDefined(parameters.endpointFilter) ? parameters.endpointFilter : $scope.search.endpointFilter;
-
+  $scope.expertMode = angular.isDefined(parameters.expertMode) ? parameters.expertMode : $scope.expertMode;
   $scope.ionItemClass = parameters.ionItemClass || 'item-border-large';
 
   $scope.selectPeer = function(peer) {
diff --git a/www/templates/currency/view_currency.html b/www/templates/currency/view_currency.html
index bf46efab609a57fb255cf511008c9b8ce9172ddf..7a24c65de9ad8043dbf335599fd66ec55bb54d34 100644
--- a/www/templates/currency/view_currency.html
+++ b/www/templates/currency/view_currency.html
@@ -20,7 +20,7 @@
         </ion-tab>
 
         <ion-tab id="helptip-currency-tab-peers"
-                 title="{{'CURRENCY.VIEW.TAB_NETWORK'|translate}}" icon="ion-network"
+                 title="{{'CURRENCY.VIEW.TAB_NETWORK'|translate}}" icon="ion-cloud"
                  ui-sref="app.currency.tab_network">
           <ion-nav-view name="tab-network"></ion-nav-view>
         </ion-tab>
diff --git a/www/templates/network/items_peers.html b/www/templates/network/items_peers.html
index 44d4d3e36fee0578e0b1a9536760b2e5b0a15a6d..88dc8c834073a1e101de5c95605b6021c75eba10 100644
--- a/www/templates/network/items_peers.html
+++ b/www/templates/network/items_peers.html
@@ -1,4 +1,4 @@
-  <div class="item row row-header hidden-xs hidden-sm"  ng-if="settings.expertMode">
+  <div class="item row row-header hidden-xs hidden-sm" ng-if="expertMode">
     <a class="col col-header no-padding dark" ng-click="toggleSort('uid')">
       <cs-sort-icon asc="search.asc" sort="search.sort" toggle="'uid'"></cs-sort-icon>
       {{'COMMON.UID' | translate}} / {{'COMMON.PUBKEY' | translate}}
@@ -41,13 +41,13 @@
           <span class="gray">{{peer.dns && ' | ' + peer.dns}}</span></h3>
         <h4>{{peer.server}}</h4>
       </div>
-      <div class="col col-15 no-padding text-center" ng-if="settings.expertMode && peer.hasEndpoint('ES_USER_API')">
+      <div class="col col-15 no-padding text-center" ng-if="expertMode && peer.hasEndpoint('ES_USER_API')">
         <h3 class="hidden-xs hidden-sm">
           <i class="ion-es-user-api"></i>
           <b class="ion-plus gray" style="position: relative; left: -14px; top:-17px; font-size : 16px;"></b>
         </h3>
       </div>
-      <div class="col col-20 no-padding text-center" ng-if="settings.expertMode && search.type != 'offline'">
+      <div class="col col-20 no-padding text-center" ng-if="expertMode && search.type != 'offline'">
         <h3 class="hidden-sm hidden-xs hidden-md">
           <span ng-if="peer.uid"><i class="ion-lock-combination"></i>{{peer.difficulty||'?'}}</span>
           <span ng-if="!peer.uid" translate>PEER.MIRROR</span>