diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php
index b9e8544c8..2c3678553 100644
--- a/admin/survey/classes/class.SurveyTheme.php
+++ b/admin/survey/classes/class.SurveyTheme.php
@@ -595,39 +595,42 @@ class SurveyTheme {
 				// show_settings(\''.$row['id'].'\');
 
 				// div z setingsi 
-				
 				// <div id="theme_additional_settings_'.$row['id'].'">
 
 
-				echo '<div class="options">';
+				echo '<div class="options options'.$row['id'].'" id="options'.$row['id'].'">';
 
-						echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>';
+				echo '<button onclick="show_settings(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
 
-				//Aktiviraj
-				echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
-				echo '<span class="faicon fa-hand-pointer"></span>';
-				echo $lang['srv_te_theme_activate'];
-				echo '</div>';
+				echo '<div class="buttons-window" id="additional_settings_'.$row['id'].'">';		
 
-				//Predogled
-				echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
-				echo '<span class="faicon fa-desktop"></span>';
-				echo $lang['srv_poglejanketo2'];
-				echo '</div>';
-
-				//Prilagodi		
-				echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
-				echo '<span class="faicon palette"></span>';
-				echo $lang['srv_te_theme_edit'];
-				echo '</div>';
-
-				//Izbriši
-				if ($groupId == -1) {
-					echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
-					echo '<span class="faicon trash empty"></span>';
-					echo $lang['srv_anketadelete_txt'];
+					//Aktiviraj
+					echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
+					echo '<span class="faicon fa-hand-pointer"></span>';
+					echo $lang['srv_te_theme_activate'];
 					echo '</div>';
-				}
+
+					//Predogled
+					echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
+					echo '<span class="faicon fa-desktop"></span>';
+					echo $lang['srv_poglejanketo2'];
+					echo '</div>';
+
+					//Prilagodi		
+					echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
+					echo '<span class="faicon palette"></span>';
+					echo $lang['srv_te_theme_edit'];
+					echo '</div>';
+
+					//Izbriši
+					if ($groupId == -1) {
+						echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
+						echo '<span class="faicon trash empty"></span>';
+						echo $lang['srv_anketadelete_txt'];
+						echo '</div>';
+					}
+				
+				echo '</div>'; // additional_settings
 				
 				echo '</div>'; //div.options
 
@@ -653,35 +656,39 @@ class SurveyTheme {
 				echo '</div>';
 
 				//Gumbi
-				echo '<div class="options">';
+				echo '<div class="options options_mobile'.$row['id'].'" id="options'.$row['id'].'">';
 
-				echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>';
+				echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
 
-				//Aktiviraj
-				echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
-				echo '<span class="faicon fa-hand-pointer"></span>';
-				echo $lang['srv_te_theme_activate'];
-				echo '</div>';
 
-				//Predogled
-				echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
-				echo '<span class="faicon fa-desktop"></span>';
-				echo $lang['srv_poglejanketo2'];
-				echo '</div>';
-
-				//Prilagodi		
-				echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
-				echo '<span class="faicon palette"></span>';
-				echo $lang['srv_te_theme_edit'];
-				echo '</div>';
-
-				//Izbriši
-				if ($groupId == -1) {
-					echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
-					echo '<span class="faicon trash empty"></span>';
-					echo $lang['srv_anketadelete_txt'];
+				echo '<div class="buttons-window" id="additional_settings_mobile_'.$row['id'].'">';
+					//Aktiviraj
+					echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
+					echo '<span class="faicon fa-hand-pointer"></span>';
+					echo $lang['srv_te_theme_activate'];
 					echo '</div>';
-				}
+
+					//Predogled
+					echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
+					echo '<span class="faicon fa-desktop"></span>';
+					echo $lang['srv_poglejanketo2'];
+					echo '</div>';
+
+					//Prilagodi		
+					echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
+					echo '<span class="faicon palette"></span>';
+					echo $lang['srv_te_theme_edit'];
+					echo '</div>';
+
+					//Izbriši
+					if ($groupId == -1) {
+						echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
+						echo '<span class="faicon trash empty"></span>';
+						echo $lang['srv_anketadelete_txt'];
+						echo '</div>';
+					}
+
+				echo '</div>'; //additional settings
 				
 				echo '</div>'; //div.options
 
diff --git a/admin/survey/script/urejanje_oblika.js b/admin/survey/script/urejanje_oblika.js
index ed921eb1f..0e580772f 100644
--- a/admin/survey/script/urejanje_oblika.js
+++ b/admin/survey/script/urejanje_oblika.js
@@ -12,8 +12,6 @@ function teme_options(){
     }
 
     toggle_id.classList.toggle('active');
-
-
 }
 
 function teme_options2(){
@@ -24,6 +22,40 @@ function teme_options2(){
             toggle_id.classList.remove('active');
         }
     }
-
     toggle_id.classList.toggle('active');
-}
\ No newline at end of file
+}
+
+function show_settings(id_of_element){
+
+    // var options = document.getElementsByClassName("options"+id_of_element)[0];
+    var options = document.getElementById("options"+id_of_element);
+    var additional_settings = document.getElementById("additional_settings_"+id_of_element);
+
+
+    // document.onclick = function(e){
+    //     if(e.target.id !== additional_settings && e.target.id !== options ){
+    //         additional_settings.classList.remove('active');
+    //     }
+    // }
+    additional_settings.classList.toggle("active");
+
+}
+
+
+function show_settings_mobile(id_of_element){
+
+    // var options = document.getElementsByClassName("options_mobile"+id_of_element)[0];
+    var options = document.getElementById("options_mobile"+id_of_element);
+    var additional_settings = document.getElementById("additional_settings_mobile_"+id_of_element);
+
+
+    // document.onclick = function(e){
+    //     if(e.target.id !== additional_settings && e.target.id !== options ){
+    //         additional_settings.classList.remove('active');
+    //     }
+    // }
+    additional_settings.classList.toggle("active");
+
+}
+
+
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 2fcc51cac..b9a8efc74 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10012,7 +10012,8 @@ textarea:focus {
   margin-top: 16px;
 }
 .box-container .num_box {
-  border: #1E88E5 solid 1px;
+  border: unset;
+  background-color: white;
   margin: 0px;
   padding: 0px;
 }
@@ -10032,7 +10033,7 @@ textarea:focus {
   margin-right: 8px;
 }
 .box-container .num_box .box_text {
-  padding: 0px 16px 16px 16px;
+  padding: 5px 16px 16px 16px;
   font-size: 16px;
   line-height: 20px;
   color: #808080;
@@ -10040,11 +10041,15 @@ textarea:focus {
   align-items: center;
 }
 .box-container .num_box .box_text .num_of_surveys {
-  font-size: 40px;
+  font-size: 32px;
   color: #333;
   font-weight: 400;
   margin-right: 5px;
 }
+.box-container .checked {
+  border: #1E88E5 solid 1px;
+  background-color: #FFEFEF;
+}
 .box-container .num_box2 {
   margin: 0px 32px;
 }
@@ -11100,9 +11105,19 @@ table.variableView {
 }
 
 table.gdpr_surveys {
-  table-layout: fixed;
+  table-layout: auto;
   width: 100%;
 }
+table.gdpr_surveys th {
+  background-color: #F8F8F8;
+}
+table.gdpr_surveys tr {
+  background-color: #FFEFEF;
+}
+table.gdpr_surveys th,
+table.gdpr_surveys td {
+  border: 1px solid #E5E5E5;
+}
 table.gdpr_surveys tr.red_row td {
   background-color: #FFEFEF !important;
 }
@@ -20754,9 +20769,10 @@ div.page_tema div.theme_list div.options {
 }
 div.page_tema div.theme_list div.options div.buttons-window {
   position: absolute;
-  bottom: 12px;
+  bottom: 15px;
   max-width: 113px;
   display: none;
+  margin-right: 5px;
 }
 div.page_tema div.theme_list div.options div.buttons-window.active {
   display: block;
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 f224fff20..abdb6d933 100644
--- a/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
@@ -55,6 +55,10 @@ div.page_tema {
             }
         }
 
+
+        
+
+
         //Gumbi
         div.options {
             display: flex;
@@ -63,9 +67,11 @@ div.page_tema {
 
             div.buttons-window{
                 position: absolute;
-                bottom: 12px;
+                bottom: 15px;
                 max-width: 113px;
                 display: none;
+
+                margin-right: 5px;
             }
             div.buttons-window.active {
                 display: block;