diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php
index c5bf34dee..55f8b9613 100644
--- a/admin/survey/classes/class.SurveyTheme.php
+++ b/admin/survey/classes/class.SurveyTheme.php
@@ -369,11 +369,12 @@ class SurveyTheme {
 		}
 
 		//Gumbi
-		echo '<div class="options option1">';
+		echo '<script src="/admin/survey/script/urejanje_oblika.js"> </script>';
+		echo '<div class="options option1" >';
 
-		echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>';
+		echo '<button id="btn-1"  onclick="teme_options()"> <img src="\public\img\icons\dots.svg"> </button>';
 
-			echo '<div class= "buttons-window active">';
+			echo '<div class= "buttons-window buttons-window1" id="buttons-window1">';
 
 				//Predogled
 				echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
@@ -423,9 +424,9 @@ class SurveyTheme {
 		//Gumbi
 		echo '<div class="options">';
 
-		echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>';
+		echo '<button id="btn-2" onclick="teme_options2()"> <img src="\public\img\icons\dots.svg"> </button>';
 
-			echo '<div class= "buttons-window active">';
+			echo '<div class= "buttons-window" id="buttons-window2">';
 
 				//Predogled
 				echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
diff --git a/admin/survey/script/GDPR_seznam_anket.js b/admin/survey/script/GDPR_seznam_anket.js
index 192d91923..3b14b7331 100644
--- a/admin/survey/script/GDPR_seznam_anket.js
+++ b/admin/survey/script/GDPR_seznam_anket.js
@@ -38,3 +38,15 @@ function test_function() {
         ne_gdpr_ankete.style.color="green";
     }
 }
+
+function teme_options(){
+    var toggle = document.getElementsByClassName('buttons-window');
+    toggle.onclick = function(){
+        toggle.classList.toggle('active');
+    }   
+}
+
+// var toggle = document.getElementById();
+// toggle.onclick = function(){
+//     toggle.classList.toggle('active');
+// }
diff --git a/admin/survey/script/urejanje_oblika.js b/admin/survey/script/urejanje_oblika.js
new file mode 100644
index 000000000..ed921eb1f
--- /dev/null
+++ b/admin/survey/script/urejanje_oblika.js
@@ -0,0 +1,29 @@
+
+
+
+function teme_options(){
+
+    var toggle_id = document.getElementById("buttons-window1");
+
+    document.onclick = function(e){
+        if(e.target.id !== 'buttons-window1' && e.target.id !== 'btn-1' ){
+            toggle_id.classList.remove('active');
+        }
+    }
+
+    toggle_id.classList.toggle('active');
+
+
+}
+
+function teme_options2(){
+    var toggle_id = document.getElementById("buttons-window2");
+
+    document.onclick = function(e){
+        if(e.target.id !== 'buttons-window2' && e.target.id !== 'btn-2' ){
+            toggle_id.classList.remove('active');
+        }
+    }
+
+    toggle_id.classList.toggle('active');
+}
\ No newline at end of file
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index f34812fd8..336be144e 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -20757,6 +20757,10 @@ div.page_tema div.theme_list div.options div.buttons-window {
   position: absolute;
   bottom: 12px;
   max-width: 113px;
+  display: none;
+}
+div.page_tema div.theme_list div.options div.buttons-window.active {
+  display: block;
 }
 div.page_tema div.theme_list div.options div.button {
   background: #FFFFFF;
diff --git a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
index 9985059c6..f224fff20 100644
--- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
@@ -65,6 +65,10 @@ div.page_tema {
                 position: absolute;
                 bottom: 12px;
                 max-width: 113px;
+                display: none;
+            }
+            div.buttons-window.active {
+                display: block;
             }
 
             div.button {