diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php
index 3ee29cb3d..ce5f34348 100644
--- a/admin/survey/classes/class.GDPR.php
+++ b/admin/survey/classes/class.GDPR.php
@@ -62,12 +62,12 @@ class GDPR{
 		echo '<fieldset>';
 		echo '<legend>'.$lang['srv_anketalist'].'</legend>';
 
-		echo '<div class="box-container" style="display:flex; justify-content: space-between; ">';
+		echo '<div class="box-container">';
 
 			echo '<div class= "num_box num_box1">';
 
-				echo '<div class="box_flex">';
-					echo '<input type="checkbox">';
+				echo '<div class="box_flex" id="box_flex">';
+					echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="test_function()">';
 					echo '<h2> GDPR ANKETE</h2>';
 				echo '</div>';
 
@@ -79,8 +79,8 @@ class GDPR{
 
 			echo '<div class= "num_box num_box2">';
 
-				echo '<div class="box_flex">';
-					echo '<input type="checkbox">';
+				echo '<div class="box_flex" id="box_flex">';
+					echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked">';
 					echo '<h2> POTENCIALNO GDPR ANKETE</h2>';
 				echo '</div>';
 
@@ -92,8 +92,8 @@ class GDPR{
 			
 			echo '<div class= "num_box num_box3">';
 
-				echo '<div class="box_flex">';
-					echo '<input type="checkbox">';
+				echo '<div class="box_flex" id="box_flex">';
+				echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked">';
 					echo '<h2> NE-GDPR ANKETE</h2>';
 				echo '</div>';
 
@@ -104,6 +104,9 @@ class GDPR{
 
 		echo '</div>';
 
+		echo '<script src="/admin/survey/script/GDPR_seznam_anket.js"></script>';
+
+
 		echo '</div>';
 
 
@@ -131,11 +134,11 @@ class GDPR{
 
 			// Nastavimo barvo vrstice
 			if($anketa['gdpr'] == 1)
-				$color = ' class="green_row"';
+				$color = ' class="green_row" id="green_row"';
 			elseif($anketa['potential_gdpr'] == 1)
-				$color = ' class="red_row"';
+				$color = ' class="red_row" id="red_row"';
 			else
-				$color = '';
+				$color = 'class="grey_row" id="grey_row"';
 
 			echo '<tr '.$color.'>';
 
diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php
index e99b8da9c..c5bf34dee 100644
--- a/admin/survey/classes/class.SurveyTheme.php
+++ b/admin/survey/classes/class.SurveyTheme.php
@@ -369,9 +369,9 @@ class SurveyTheme {
 		}
 
 		//Gumbi
-		echo '<div class="options">';
+		echo '<div class="options option1">';
 
-		echo '<img src="\public\img\icons\dots.svg">';
+		echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>';
 
 			echo '<div class= "buttons-window active">';
 
@@ -423,7 +423,7 @@ class SurveyTheme {
 		//Gumbi
 		echo '<div class="options">';
 
-		echo '<img src="\public\img\icons\dots.svg">';
+		echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>';
 
 			echo '<div class= "buttons-window active">';
 
@@ -593,7 +593,7 @@ class SurveyTheme {
 				//Gumbi
 				echo '<div class="options">';
 
-				echo '<img src="\public\img\icons\dots.svg">';
+						echo '<button onclick="show_settings()"> <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'].'">';
@@ -647,7 +647,7 @@ class SurveyTheme {
 				//Gumbi
 				echo '<div class="options">';
 
-				echo '<img src="\public\img\icons\dots.svg">';
+				echo '<button onclick="show_settings()"> <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'].'">';
diff --git a/admin/survey/classes/class.Vprasanje.php b/admin/survey/classes/class.Vprasanje.php
index 0b2c2cf00..8b4df1510 100644
--- a/admin/survey/classes/class.Vprasanje.php
+++ b/admin/survey/classes/class.Vprasanje.php
@@ -474,11 +474,11 @@ class Vprasanje {
 					if ($row['ranking_k'] == 0){	
 
                         echo '<fieldset>';
-                        //echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>';
-                        echo '  <legend>'.$lang['srv_num_limits'].'</legend>';
+                        echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_num_limits'].'</legend>';
+                        //echo '  <legend>'.$lang['srv_num_limits'].'</legend>';
 
-                        //echo '  <div class="fieldset_holder" style="display:none;">';
-                        echo '  <div class="fieldset_holder">';
+                        echo '  <div class="fieldset_holder" style="display:none;">';
+                        //echo '  <div class="fieldset_holder">';
 
                         if ($row['tip'] != 21)
 						    $this->edit_number();
@@ -493,11 +493,11 @@ class Vprasanje {
 
                 if ($row['tip'] == 7) {
                     echo '<fieldset>';
-                    //echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
-                    echo '  <legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    echo '  <legend class="pointer" onClick="fieldsetToggle(this);"><span class="faicon arrow2_d"></span>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
+                    //echo '  <legend>'.$lang['srv_manjkajoce_vrednosti2'].' '.Help::display('srv_missing_values').'</legend>';
                     
-                    //echo '  <div class="fieldset_holder" style="display:none;">';
-                    echo '  <div class="fieldset_holder">';
+                    echo '  <div class="fieldset_holder" style="display:none;">';
+                    //echo '  <div class="fieldset_holder">';
                     $this->edit_vrednost_missing();
                     echo '  </div>';
 
diff --git a/admin/survey/script/GDPR_seznam_anket.js b/admin/survey/script/GDPR_seznam_anket.js
new file mode 100644
index 000000000..192d91923
--- /dev/null
+++ b/admin/survey/script/GDPR_seznam_anket.js
@@ -0,0 +1,40 @@
+// Seznam anket - togle checkbox prikaz anket
+
+function test_function() {
+    var inputs = document.getElementById("gdpr_ankete_check");
+    var potenc_gdpr = document.getElementById("potenc_gdpr_ankete_check");
+    var ne_gdpr_ankete = document.getElementById("ne_gdpr_ankete")
+
+    var green_row = document.getElementById("green_row");
+    var red_row = document.getElementById("red_row");
+    var grey_row = document.getElementById("grey_row");
+
+    // GDPR ANKETE togle
+    if (!inputs.checked){
+        // document.getElementById("green_row").style.display="none";
+        green_row.style.display="none";
+        document.getElementById("box_flex").style.color="red";
+
+    }
+    else{
+        // document.getElementById("green_row").style.display="table-row";
+        green_row.style.display="table-row";
+        document.getElementById("box_flex").style.color="green";
+    }
+    // potencialno GDPR ankete togle
+    if (!potenc_gdpr.checked){
+        document.getElementById("red_row").style.display="none";
+    }
+    else{
+        document.getElementById("red_row").style.display="table-row";
+    }
+    // ne-GDPR ankete
+    if (!ne_gdpr_ankete.checked){
+        document.getElementById("grey_row").style.display="none";
+        ne_gdpr_ankete.style.color="red";
+    }
+    else{
+        document.getElementById("grey_row").style.display="table-row";
+        ne_gdpr_ankete.style.color="green";
+    }
+}
diff --git a/frontend/simple/css/aai.css b/frontend/simple/css/aai.css
index 383f3d903..a23d3aba1 100644
--- a/frontend/simple/css/aai.css
+++ b/frontend/simple/css/aai.css
@@ -820,7 +820,7 @@ input[type=button]:hover,
   }
   #links.open {
     position: absolute;
-    top: 100px;
+    top: 55px;
     left: 0px;
     display: flex;
     flex-direction: column;
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index da975d6b8..f34812fd8 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5117,7 +5117,7 @@ p, span {
 }
 
 .bold {
-  font-weight: 400;
+  font-weight: 800;
 }
 
 .semi-bold {
@@ -9886,6 +9886,22 @@ fieldset ul {
   padding-inline-start: 25px;
 }
 
+.gdpr_authority_info_data .spaceLeft {
+  display: flex;
+}
+.gdpr_authority_info_data .spaceLeft .bold {
+  padding-left: 3px;
+}
+.gdpr_authority_info_data .authority_name {
+  font-weight: 600;
+}
+
+#gdpr_nastavitve .bold {
+  font-weight: 400;
+  color: #1E88E5;
+  text-decoration: underline;
+}
+
 select, option {
   font-family: Source Sans Pro, sans-serif;
 }
@@ -9990,6 +10006,49 @@ textarea:focus {
   border-color: #1E88E5;
 }
 
+#gdpr_nastavitve fieldset {
+  padding: 0px;
+}
+
+.box-container {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 16px;
+}
+.box-container .num_box {
+  border: #1E88E5 solid 1px;
+  margin: 0px;
+  padding: 0px;
+}
+.box-container .num_box .box_flex {
+  padding: 16px 16px 0px 16px;
+  display: flex;
+  align-items: center;
+}
+.box-container .num_box .box_flex h2 {
+  font-size: 16px !important;
+  font-weight: 600;
+}
+.box-container .num_box .box_flex input {
+  position: unset;
+  height: 18px;
+  width: 18px;
+  margin-right: 8px;
+}
+.box-container .num_box .box_text {
+  padding: 0px 16px 16px 16px;
+  font-size: 32px;
+  line-height: 20px;
+}
+.box-container .num_box .box_text span {
+  font-size: 16px;
+  color: #808080;
+  font-weight: 400;
+}
+.box-container .num_box2 {
+  margin: 0px 32px;
+}
+
 table {
   margin: 8px 0;
   padding: 8px 0;
@@ -17936,9 +17995,8 @@ span.display_editor_image_hotspot {
 canvas.hotspot_canvas {
   position: absolute;
   top: 15px !important;
-  /* left: 10px; */
+  left: 10px;
   z-index: 2;
-  display: block;
 }
 
 .hotspot_image_editor {
@@ -20356,14 +20414,14 @@ and open the template in the editor.
   color: #0059ab;
 }
 
-/* canvas.mapster_el {
+canvas.mapster_el {
   top: 15px !important;
 }
 
 img.mapster_el {
   position: absolute;
   top: 15px !important;
-} */
+}
 
 .jquery-selectbox {
   cursor: pointer;
@@ -20693,6 +20751,12 @@ div.page_tema div.theme_list div.theme span.desc {
 div.page_tema div.theme_list div.options {
   display: flex;
   flex-direction: row;
+  position: relative;
+}
+div.page_tema div.theme_list div.options div.buttons-window {
+  position: absolute;
+  bottom: 12px;
+  max-width: 113px;
 }
 div.page_tema div.theme_list div.options div.button {
   background: #FFFFFF;
@@ -20700,7 +20764,7 @@ div.page_tema div.theme_list div.options div.button {
   box-sizing: border-box;
   border-radius: 2px;
   height: 28px;
-  width: fit-content;
+  width: 100%;
   display: flex;
   align-items: center;
   padding: 7px 12px;
@@ -27978,7 +28042,7 @@ and open the template in the editor.
 .setting_horizontal_wrapper {
   display: flex;
   flex-direction: row;
-  margin-bottom: 16px;
+  margin-bottom: 0px;
 }
 .setting_horizontal_wrapper .setting_holder {
   margin-right: 32px;
@@ -32940,6 +33004,50 @@ table.dataTable td:not(:first-of-type), table.dataTable th:not(:first-of-type) {
   border-left: 1px solid #E5E5E5;
 }
 
+/* 
+    Custom modules
+*/
+.page_kolektor button.kolektor_create_response {
+  margin-bottom: 40px;
+}
+.page_kolektor table.kolektor_reponses {
+  width: 100%;
+}
+
+#kolektor_add_response {
+  max-height: 95vh;
+  overflow-y: auto;
+}
+#kolektor_add_response #kolektor_add_response_form {
+  display: flex;
+  flex-direction: column;
+}
+#kolektor_add_response #kolektor_add_response_form .error_messages {
+  margin-bottom: 16px;
+  font-weight: 600;
+}
+#kolektor_add_response #kolektor_add_response_form .error_messages ul {
+  margin: 0;
+}
+#kolektor_add_response #kolektor_add_response_form .kolektor_setting {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 8px;
+}
+#kolektor_add_response #kolektor_add_response_form .kolektor_setting.error {
+  color: #FF0000;
+}
+#kolektor_add_response #kolektor_add_response_form .kolektor_setting .setting_line {
+  margin-top: 8px;
+}
+#kolektor_add_response #kolektor_add_response_form #kolektor_respondent_settings {
+  display: flex;
+  flex-direction: column;
+}
+#kolektor_add_response #kolektor_add_response_form textarea {
+  width: 100%;
+}
+
 @media (max-width: 1100px) {
   #quick_comments_link.newCss {
     display: none;
@@ -33423,9 +33531,6 @@ header .mobile_menu .mobile_menu_user .submenu_user_content > div a {
   #main #moje_ankete_edit #survey_list .second_line .filters {
     display: none;
   }
-  #main #moje_ankete_edit #survey_list .div_sl_new table#surveyList_new {
-    margin: 0;
-  }
   #main #moje_ankete_edit #survey_list .div_sl_new table#surveyList_new td {
     display: none;
   }
diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss
index ed3a3262d..e82ce1398 100644
--- a/resources/sass/admin_new/components/form/fieldset.scss
+++ b/resources/sass/admin_new/components/form/fieldset.scss
@@ -8,25 +8,6 @@ fieldset{
 
     border: 1px solid $gray;
 
-    .bold{
-        font-weight: 400;
-        color: #1E88E5;
-
-        text-decoration: underline;
-    }
-
-    .spaceLeft{
-        display: flex;
-
-        .bold{
-            padding-left: 3px;
-        }
-    }
-
-    .authority_name{
-        font-weight: 600;
-    }
-
     legend{
         padding: 0 15px;
 
@@ -120,4 +101,34 @@ fieldset{
         margin-block-end: 0;
         padding-inline-start: 25px;
     }
-}
\ No newline at end of file
+}
+
+
+.gdpr_authority_info_data{
+
+
+    .spaceLeft{
+        display: flex;
+
+        .bold{
+            padding-left: 3px;
+        }
+    }
+
+    .authority_name{
+        font-weight: 600;
+    } 
+
+}
+
+#gdpr_nastavitve {
+    
+    .bold{
+        font-weight: 400;
+        color: #1E88E5;
+
+        text-decoration: underline;
+    }
+}
+
+
diff --git a/resources/sass/admin_new/components/form/form.scss b/resources/sass/admin_new/components/form/form.scss
index cafafcf91..4044e8386 100644
--- a/resources/sass/admin_new/components/form/form.scss
+++ b/resources/sass/admin_new/components/form/form.scss
@@ -7,4 +7,5 @@
 @import "input";
 @import "fieldset";
 @import "dropdown";
-@import "textarea";
\ No newline at end of file
+@import "textarea";
+@import "seznam_anket";
\ No newline at end of file
diff --git a/resources/sass/admin_new/components/form/seznam_anket.scss b/resources/sass/admin_new/components/form/seznam_anket.scss
new file mode 100644
index 000000000..3c0f04255
--- /dev/null
+++ b/resources/sass/admin_new/components/form/seznam_anket.scss
@@ -0,0 +1,65 @@
+#gdpr_nastavitve{
+    fieldset{
+        padding: 0px;
+
+    }
+}
+
+
+.box-container{
+     display: flex;
+     justify-content: space-between;
+
+     margin-top: 16px;
+
+     .num_box{
+        border: #1E88E5 solid 1px;
+
+        margin: 0px;
+        padding: 0px;
+
+        .box_flex{
+            padding: 16px 16px 0px 16px;
+            display: flex;
+            align-items: center;
+
+            h2{
+                font-size: 16px !important;
+                font-weight: 600;
+
+            }
+
+            input {
+
+                position: unset;
+                
+                height: 18px;
+                width: 18px;
+
+                margin-right: 8px;
+
+            
+            }
+            
+        }
+
+        .box_text{
+            padding: 0px 16px 16px 16px;
+            font-size: 32px;
+            line-height: 20px;
+
+            span{
+                font-size: 16px;
+                color: #808080;
+                font-weight: 400;
+            }
+
+        }
+    }
+
+    .num_box2{
+        margin: 0px 32px ;
+    }
+    
+
+}
\ No newline at end of file
diff --git a/resources/sass/frontend_simple/aai.scss b/resources/sass/frontend_simple/aai.scss
index c8bcd8005..0c903c508 100644
--- a/resources/sass/frontend_simple/aai.scss
+++ b/resources/sass/frontend_simple/aai.scss
@@ -995,7 +995,7 @@ input[type=button],
       
     #links.open {
         position: absolute;
-        top: 100px;
+        top: 55px;
         left: 0px;
 
         display: flex;