diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 0c7a229ff..5c05a694a 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -653,7 +653,7 @@ class SurveyAdmin
 
 
         // Search po zunanji lupini - preusmeri na drupalov search
-        echo '<div id="search_holder">';
+        echo '<div id="search_holder" class="setting_box">';
 
         if($lang['id'] != "1")
             $drupal_search_url = 'https://www.1ka.si/d/en/iskanje/';
@@ -676,10 +676,10 @@ class SurveyAdmin
         // Hitra pomoč - povezave na linke s pomočjo na www.1ka.si
         $subdomain = ($lang['id'] == "1") ? 'www' : 'english';
         $help_url = Common::getHelpUrl($subdomain, $this->first_action);
-        echo '<div id="help_holder">';
-        echo ' <a href="' . $help_url . '" title="' . $lang['srv_settings_help'] . '" target="_blank">';
-        echo '<span class="faicon help2"></span>';
-        echo '</a> ';
+        echo '<div id="help_holder" class="setting_box">';
+        echo '  <a href="' . $help_url . '" title="' . $lang['srv_settings_help'] . '" target="_blank">';
+        echo '      <span class="faicon help2"></span>';
+        echo '  </a> ';
         echo '</div>';
 
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 9b907de70..581aa1503 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6058,20 +6058,24 @@ and open the template in the editor.
     Author     : Peter Hrvatin
 */
 /* NAPREDNI MODULI */
+.navigation_modules a {
+  text-decoration: none !important;
+}
+
 span.module_icon {
   display: flex;
   align-items: center;
-  height: 25px;
+  height: 24px;
   padding: 0 8px;
-  color: white;
-  font-weight: 600;
+  color: #FFFFFF;
+  font-weight: 700;
   font-size: 16px;
-  background-color: transparent;
-  border: 1px #FFFFFF solid;
-  text-decoration: none !important;
+  background-color: #0059ab;
+  border-radius: 2px;
+  transition: 0.2s;
 }
 span.module_icon::before {
-  line-height: 25px;
+  line-height: 20px;
 }
 span.module_icon.maza::before {
   content: "MAZA";
@@ -6152,21 +6156,16 @@ span.module_icon.mju::before {
   content: "MJU";
 }
 span.module_icon.gdpr {
-  color: #E5E5E5;
-  background-color: #1E88E5;
-  border: 1px #FFFFFF solid;
+  color: #1E88E5;
 }
 span.module_icon.gdpr:hover {
   color: #FFFFFF;
 }
 span.module_icon.gdpr.active {
-  color: white;
-  background-color: #1E88E5;
-  border: 1px #FFFFFF solid;
+  color: #FFFFFF;
 }
 span.module_icon.gdpr.active:hover {
   color: white;
-  border: 1px #FFFFFF solid;
 }
 span.module_icon.gdpr::before {
   content: "GDPR";
@@ -7972,6 +7971,7 @@ header #top_line .setting_box {
   align-items: center;
   justify-content: center;
   height: 28px;
+  min-width: 28px;
   margin-left: 8px;
   border: 1px solid #E5E5E5;
   box-sizing: border-box;
@@ -8140,8 +8140,8 @@ header #top_line #enka_nav {
   position: absolute;
   right: 32px;
 }
-header #top_line #enka_nav div {
-  margin-left: 24px;
+header #top_line #enka_nav #search_holder {
+  margin-left: 16px;
 }
 header #top_line #enka_nav #search_holder form {
   display: flex;
@@ -8150,9 +8150,12 @@ header #top_line #enka_nav #search_holder form {
 header #top_line #enka_nav #search_holder input#searchSurvey {
   display: none;
   width: 150px;
-  padding: 3px 0 3px 5px;
-  margin: -3px 0 0 5px;
-  border: 1px solid #1E88E5;
+  padding: 4px 0 3px 5px;
+  margin: 0;
+  border: 0;
+}
+header #top_line #enka_nav #help_holder {
+  margin-left: 8px;
 }
 header #top_line span.sprites.mail_unread {
   color: #FFFFFF;
@@ -8165,7 +8168,7 @@ header #top_line span.sprites.mail_unread {
 header #top_line #xtradiv {
   display: inline-block;
   width: auto;
-  margin-left: 15px;
+  margin-left: 16px;
   vertical-align: middle;
 }
 header #top_line #xtradiv .xtraname {
@@ -8173,7 +8176,7 @@ header #top_line #xtradiv .xtraname {
   align-items: center;
   cursor: pointer;
   width: auto;
-  font-weight: 500;
+  font-weight: 400;
   color: #1E88E5;
 }
 header #top_line #xtradiv .xtraname:hover {
diff --git a/resources/sass/admin_new/basic/icons/modules.scss b/resources/sass/admin_new/basic/icons/modules.scss
index 2f03d4fec..18e3d26c8 100644
--- a/resources/sass/admin_new/basic/icons/modules.scss
+++ b/resources/sass/admin_new/basic/icons/modules.scss
@@ -10,23 +10,31 @@ and open the template in the editor.
 
 /* NAPREDNI MODULI */
 
+.navigation_modules{
+    
+    a{
+        text-decoration: none !important;
+    }
+}
+
 span.module_icon{
     display: flex;
     align-items: center;
 
-    height: 25px;
+    height: 24px;
 	padding: 0 8px;
 
-	color: white;
-	font-weight: 600;
+	color: $white;
+	font-weight: 700;
 	font-size: 16px;
 
-	background-color: transparent;
-	border: 1px $white solid;
-    text-decoration: none !important;
+	background-color: $dark-blue;
+    border-radius: 2px;    
+
+    transition: 0.2s;
+
     &::before{
-        line-height: 25px;
-        
+        line-height: 20px;
     }
 
     &.maza::before{
@@ -110,22 +118,17 @@ span.module_icon{
     }
     
     &.gdpr{
-        color: $gray;
-        background-color: $blue;
-        border: 1px $white solid;
+        color: $blue;
         
         &:hover{
             color: $white;
         }
 
         &.active{
-            color: white;
-            background-color: $blue;
-            border: 1px $white solid;
+            color: $white;
             
             &:hover{
                 color: white;
-                border: 1px $white solid;
             }
         }
 
diff --git a/resources/sass/admin_new/components/header/top_line.scss b/resources/sass/admin_new/components/header/top_line.scss
index 71e87f2b2..a194a1450 100644
--- a/resources/sass/admin_new/components/header/top_line.scss
+++ b/resources/sass/admin_new/components/header/top_line.scss
@@ -44,6 +44,7 @@ header #top_line{
         justify-content: center;
         
         height: 28px;  
+        min-width: 28px;
         margin-left: 8px;
         
         border: 1px solid $gray;
@@ -287,11 +288,8 @@ header #top_line{
         position: absolute;
         right: 32px;
 
-        div{
-            margin-left: 24px;
-        }
-
         #search_holder {
+            margin-left: 16px;
 
             form{
                 display: flex;
@@ -301,13 +299,13 @@ header #top_line{
             input#searchSurvey {
                 display: none;
                 width: 150px;
-                padding: 3px 0 3px 5px;
-                margin: -3px 0 0 5px;
-                border: 1px solid $blue;
+                padding: 4px 0 3px 5px;
+                margin: 0;
+                border: 0;
             }
         }
         #help_holder {
-
+            margin-left: 8px;
         }
         #fieldwork_holder {
 
@@ -327,7 +325,7 @@ header #top_line{
     #xtradiv {
         display: inline-block;
         width: auto;
-        margin-left: 15px;
+        margin-left: 16px;
         vertical-align: middle;
         
         .xtraname {
@@ -337,7 +335,7 @@ header #top_line{
             cursor: pointer;
 
             width: auto;
-            font-weight: 500;
+            font-weight: 400;
             color: $blue;
             
             &:hover{