diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index 9294b7714..14802b853 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -1786,10 +1786,71 @@ class Branching {
 		echo '</div>';
 
 		// Napredne nastavitve dropdown
+		$row = SurveyInfo::getInstance()->getSurveyRow();
+    	# preverimo ali imamo ife. Če so, izpisujemo vse ikonce
+		$sql_select = "SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'";
+		$sql_query = sisplet_query($sql_select);
+		$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_select_fv = "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'";
+		$sql_query_fv = sisplet_query($sql_select_fv);
+		$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="top_napredne_holder">';
+		
 		echo '<div id="top_napredne_gumb" class="button" onclick="toggleSurveyTopSettings();">';
 		echo $lang['srv_quick_settings_napredno'];
 		echo '<span id="top_napredne_icon" class="faicon fa-angle-down blue left"></span>';
 		echo '</div>';
+		
+		echo '<div id="top_napredne_dropdown" class="displayNone">';
+		# find & replace
+		if ($row['locked'] == 0) {
+			echo '<p class="segment_option">';
+			echo '<a href="#" onclick="find_replace(); toggleSurveyTopSettings(); 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(); toggleSurveyTopSettings(); 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(); toggleSurveyTopSettings(); 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(); toggleSurveyTopSettings(); 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>';
+
+		// 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>';**/
+
+		echo '</div>';
 
 		echo '</div>'; //left_settings
 		echo '<div class="right_settings">';
diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js
index d8505db69..9187c562a 100644
--- a/admin/survey/script/script.js
+++ b/admin/survey/script/script.js
@@ -5628,5 +5628,5 @@ function toggleSurveyTopSettings() {
 	$("#top_napredne_icon").toggleClass("fa-angle-down");
 	$("#top_napredne_icon").toggleClass("fa-angle-up");
 	$("#top_napredne_gumb").toggleClass("border_blue");
-
+	$("#top_napredne_dropdown").toggleClass("displayNone");
 }
\ No newline at end of file
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 1fc5fc889..91f812133 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20499,6 +20499,55 @@ img.mapster_el {
 .top_center_settings .right_settings .button span.faicon.left {
   margin: 0 0 0 8px;
 }
+.top_center_settings .left_settings #top_napredne_holder,
+.top_center_settings .right_settings #top_napredne_holder {
+  position: relative;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown {
+  position: absolute;
+  z-index: 99;
+  width: auto;
+  padding-bottom: 8px;
+  background: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+  top: 32px;
+  width: 300px;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option {
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 5px 16px 5px 16px;
+  font-size: 14px;
+  line-height: 18px;
+  transition: 0.2s;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option:hover,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option:hover {
+  background-color: #F8F8F8;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help),
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help),
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help),
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) {
+  color: #333333;
+  text-decoration: none;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon,
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon {
+  margin-right: 8px;
+}
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon:before,
+.top_center_settings .left_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon:before,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:not(.help) .faicon:before,
+.top_center_settings .right_settings #top_napredne_holder #top_napredne_dropdown .segment_option a:hover:not(.help) .faicon:before {
+  font-size: 14px;
+  color: #1E88E5;
+}
 .top_center_settings .left_settings .square,
 .top_center_settings .right_settings .square {
   width: 28px;
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 201bfeb94..6b32feeda 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
@@ -13,6 +13,7 @@
         display: flex;
         flex-direction: row;
 
+
         .button {
             border: 1px solid $gray;
             box-sizing: border-box;
@@ -39,6 +40,57 @@
             }
         }
 
+        #top_napredne_holder {
+            position: relative;
+
+            #top_napredne_dropdown {
+                position: absolute;
+                
+                z-index: 99;
+
+                width: auto;
+                padding-bottom: 8px;
+                background: $white;
+                border: 1px solid $gray;
+                
+                box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.15);
+
+                top: 32px;
+                width: 300px;
+
+                .segment_option{
+                    cursor: pointer;
+                    white-space: nowrap;
+        
+                    padding: 5px 16px 5px 16px;
+        
+                    font-size: 14px;
+                    line-height: 18px;
+        
+                    transition: 0.2s;
+        
+                    &:hover{
+                        background-color: $light-gray;
+                    }
+
+                    a:not(.help),
+                    a:hover:not(.help){
+                        color: $black;
+                        text-decoration: none;
+
+                        .faicon{
+                            margin-right: 8px;
+
+                            &:before{
+                                font-size: 14px;
+                                color: $blue;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         .square {
             width: 28px;
             height: 28px;