diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index bc88e3dc0..3330b343c 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -10,33 +10,36 @@ template(name="people")
           else if orgSetting.get
             span
               i.fa.fa-sitemap
-              | {{_ 'organizations'}}
+              unless isMiniScreen
+                | {{_ 'organizations'}}
             input#searchOrgInput(placeholder="{{_ 'search'}}")
             button#searchOrgButton
               i.fa.fa-search
               | {{_ 'search'}}
             .ext-box-right
-              span {{_ 'org-number'}} #{orgNumber}
+              span {{#unless isMiniScreen}}{{_ 'org-number'}}{{/unless}} #{orgNumber}
           else if teamSetting.get
             span
               i.fa.fa-users
-              | {{_ 'teams'}}
+              unless isMiniScreen
+                | {{_ 'teams'}}
             input#searchTeamInput(placeholder="{{_ 'search'}}")
             button#searchTeamButton
               i.fa.fa-search
               | {{_ 'search'}}
             .ext-box-right
-              span {{_ 'team-number'}} #{teamNumber}
+              span {{#unless isMiniScreen}}{{_ 'team-number'}}{{/unless}} #{teamNumber}
           else if peopleSetting.get
             span
               i.fa.fa-user
-              | {{_ 'people'}}
+              unless isMiniScreen
+                | {{_ 'people'}}
             input#searchInput(placeholder="{{_ 'search'}}")
             button#searchButton
               i.fa.fa-search
               | {{_ 'search'}}
             .ext-box-right
-              span {{_ 'people-number'}} #{peopleNumber}
+              span {{#unless isMiniScreen}}{{_ 'people-number'}}{{/unless}} #{peopleNumber}
       .content-body
         .side-menu
           ul
diff --git a/client/components/settings/settingHeader.jade b/client/components/settings/settingHeader.jade
index 221c1b793..d7ab8ca23 100644
--- a/client/components/settings/settingHeader.jade
+++ b/client/components/settings/settingHeader.jade
@@ -3,22 +3,21 @@ template(name="settingHeaderBar")
     span {{_ 'admin-panel'}}
 
   .setting-header-btns.left
-    unless isMiniScreen
-      if currentUser
-        a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
-          i.fa(class="fa-cog")
-          span {{_ 'settings'}}
+    if currentUser
+      a.setting-header-btn.settings(href="{{pathFor 'setting'}}")
+        i.fa(class="fa-cog")
+        span {{_ 'settings'}}
 
-        a.setting-header-btn.people(href="{{pathFor 'people'}}")
-          i.fa(class="fa-users")
-          span {{_ 'people'}}
+      a.setting-header-btn.people(href="{{pathFor 'people'}}")
+        i.fa(class="fa-users")
+        span {{_ 'people'}}
 
-        a.setting-header-btn.informations(href="{{pathFor 'information'}}")
-          i.fa(class="fa-info-circle")
-          span {{_ 'info'}}
+      a.setting-header-btn.informations(href="{{pathFor 'information'}}")
+        i.fa(class="fa-info-circle")
+        span {{_ 'info'}}
 
-      else
-        a.setting-header-btn.js-log-in(
-          title="{{_ 'log-in'}}")
-          i.fa.fa-sign-in
-          span {{_ 'log-in'}}
+    else
+      a.setting-header-btn.js-log-in(
+        title="{{_ 'log-in'}}")
+        i.fa.fa-sign-in
+        span {{_ 'log-in'}}