diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 14802b853..40a03b9e7 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -323,20 +323,6 @@ class Branching {
 		$this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type");
 		$hierarhija = SurveyInfo::getInstance()->checkSurveyModule('hierarhija');
 
-		// Toolbox napredne nastavitve (prestevilci, dodaj prelome, debug...)
-		if($this->survey_type > 1 && !SurveyInfo::getInstance()->checkSurveyModule('hierarhija') ){
-		
-			echo '<div id="toolbox_advanced_settings" class="toolbox">';
-
-			echo '<div class="toolbox_item"><span class="item_icon faicon wheel_32"></span> <span class="item_text">'.$lang['srv_advanced_settings_title'].'</span></div>';
-
-			$this->toolbox_add_advanced_settings();
-
-			echo '</div>';
-
-            echo '<div class="toolbox_border"></div>';
-		}
-
 
 		echo '<div id="toolbox_basic" class="toolbox '.($this->survey_type==1?' forma':'').($hierarhija ? ' toolbox-hierarhija' : '').'">';
 
@@ -596,97 +582,6 @@ class Branching {
 		echo '</div>';
     }
 
-	/**
-    * prikaze popup z vsemi tipi vprasanj
-    *
-    */
-    function toolbox_add_advanced_settings() {
-		global $lang;
-		global $admin_type;
-		global $site_url;
-		global $global_user_id;
-
-
-        $row = SurveyInfo::getInstance()->getSurveyRow();
-
-    	# preverimo ali imamo ife. Če so, izpisujemo vse ikonce
-		$sql_query = sisplet_query("SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'");
-		$row_query = mysqli_fetch_array($sql_query);
-		$has_if = (int)$row_query['if_count'] > 0 ? true : false;
-
-		# ali prikazujemo vse ikonice ali samo "simpl" ikonice
-		$sql_query_fv = sisplet_query("SELECT count(*) AS full_view FROM srv_user_setting_for_survey WHERE sid='".$this->anketa."' AND uid='".$global_user_id."' AND what='display_full_toolbox' AND value='1'");
-		$row_query_fv = mysqli_fetch_array($sql_query_fv);
-		$full_view = (int)$row_query_fv['full_view'] == 1 ? true : false;
-		$full_view = true;
-
-
-		echo '<div id="toolbox_advanced_settings_holder" class="toolbox_expand">';
-
-		echo '<div class="toolbox_expand_title"><span class="faicon wheel_32"></span>'.$lang['srv_advanced_settings_title'].'</div>';
-
-    
-        echo '<div class="toolbox_expand_segment">';
-
-		// Razsiri / skrci
-		if($this->survey_type > 1){
-			if($this->expanded) {
-				echo '<p class="segment_option">';
-				echo '<a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=0" title="'.$lang['srv_expanded_0'].'">';
-				echo '<span class="faicon compress"></span>';
-				echo $lang['srv_expand_0'];
-				echo '</a>';
-				echo '</p>';
-			}
-			else {
-				echo '<p class="segment_option">';
-				echo '<a href="index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=expanded&value=1" title="'.$lang['srv_expanded_1'].'">';
-				echo '<span class="faicon expand"></span>';
-				echo $lang['srv_expand_1'];
-				echo '</a>';
-				echo '</p>';
-			}
-		}
-
-		/*if ($has_if == true) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'expand\'); return false;"><span class="faicon plus_square" title="'.$lang['srv_expand'].'"></span>'.$lang['srv_expand'].'</a>'."\n";
-			echo '<a href="#" onClick="expandCollapseAllPlusMinus(\'collapse\'); return false;"><span class="faicon minus_square" title="'.$lang['srv_collapse'].'"></span>'.$lang['srv_collapse'].'</a>'."\n";
-			echo '</p>';
-		}*/
-
-		# find & replace
-		if ($row['locked'] == 0) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="find_replace(); return false;" title="'.$lang['srv_find_replace_words'].'" ><span class="faicon replace"></span>'.$lang['srv_find_replace_words'].'</a>';
-			echo '</p>';
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="javascript:pagebreak_all(); return false;" title="'.$lang['srv_pagebreak_all'].'"><span class="faicon paragraph"></span>'.$lang['srv_pagebreak_all'].'</a> '."\n";
-			echo '</p>';
-		}
-
-		# Hrošč je viden samo če imamo ife in razširjen pogled
-		if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0)
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="javascript:check_pogoji(); return false;" title="'.$lang['srv_check_pogoji'].'"><span class="faicon bug"></span>'.$lang['srv_check_pogoji'].'</a> '."\n";
-			echo '</p>';
-		}
-
-		if ($row['locked'] == 0 && $full_view == true) {
-			echo '<p class="segment_option">';
-			echo '<a href="#" onclick="prestevilci(); return false;"><span class="faicon hashtag" title="'.$lang['srv_grupe_recount_branching'].'"></span>'.$lang['srv_grupe_recount_branching'].'</a>' . Help :: display('srv_grupe_recount_branching')  ."\n";
-			echo '</p>';
-		}
-		
-		echo '</div>';
-
-
-		echo '</div>';
-    }
-
     /**
      * preview
      *
@@ -1835,20 +1730,19 @@ class Branching {
 		}
 		echo '</div>';
 
-		// Klik izven razprith nastavitev - zapremo okno
-        /**echo '<script>
+		//Klik izven razprith nastavitev - zapremo okno
+        echo '<script>
             $(document).mouseup(function(e){
                 var container = $("#top_napredne_dropdown");
             
 				if (!container.is(e.target) && container.has(e.target).length === 0){
                     $("#top_napredne_dropdown").addClass("displayNone");
-					$("#top_napredne_gumb").removeClass("border_blue");
 					$("#top_napredne_gumb").removeClass("border_blue");
 					$("#top_napredne_icon").addClass("fa-angle-down");
 					$("#top_napredne_icon").removeClass("fa-angle-up");
                 }
             });
-        </script>';**/
+        </script>';
 
 		echo '</div>';
 
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 91f812133..000108396 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20464,8 +20464,6 @@ img.mapster_el {
   display: flex;
   flex-direction: row;
   margin-bottom: 20px;
-  padding-bottom: 22px;
-  border-bottom: 1px solid #D3D3D3;
   width: 100%;
   justify-content: space-between;
 }
@@ -20508,7 +20506,7 @@ img.mapster_el {
   position: absolute;
   z-index: 99;
   width: auto;
-  padding-bottom: 8px;
+  padding: 8px 16px;
   background: #FFFFFF;
   border: 1px solid #E5E5E5;
   box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
@@ -20519,7 +20517,7 @@ img.mapster_el {
 .top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option {
   cursor: pointer;
   white-space: nowrap;
-  padding: 5px 16px 5px 16px;
+  padding: 5px 0;
   font-size: 14px;
   line-height: 18px;
   transition: 0.2s;
diff --git a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
index 6b32feeda..506c0392b 100644
--- a/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
+++ b/resources/sass/admin_new/pages/survey_edit/top_center_settings.scss
@@ -2,8 +2,6 @@
     display: flex;
     flex-direction: row;
     margin-bottom: 20px;
-    padding-bottom: 22px;
-    border-bottom: 1px solid $dark-gray2;
     width: 100%;
 
     justify-content: space-between;
@@ -49,7 +47,7 @@
                 z-index: 99;
 
                 width: auto;
-                padding-bottom: 8px;
+                padding: 8px 16px;
                 background: $white;
                 border: 1px solid $gray;
                 
@@ -62,7 +60,7 @@
                     cursor: pointer;
                     white-space: nowrap;
         
-                    padding: 5px 16px 5px 16px;
+                    padding: 5px 0;
         
                     font-size: 14px;
                     line-height: 18px;