diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php
index 73be9662e..329df203c 100644
--- a/admin/survey/SurveyAdminAjax.php
+++ b/admin/survey/SurveyAdminAjax.php
@@ -3263,14 +3263,14 @@ class SurveyAdminAjax {
 				sisplet_query("UPDATE srv_anketa SET locked='1' WHERE id = '$anketa'");
 
 				// Popup
-                echo '<div id="anketa_activate_note" class="divPopUp">';
+                echo '<div id="anketa_activate_note" class="divPopUp PopUpNarow">';
 
                 echo '<div class="popup_close"><a href="#" onClick="anketa_activate_save(\''.$this->anketa.'\',\''.$folders.'\'); return false;">✕</a></div>';
                 
                 echo '<h2>' . $lang['srv_hierarchy_activation_header'] . '.</h2>';
 
-                echo '<div>' . $lang['srv_activation_expire'] . $expire . '</div>';
-                echo '<div id="div_anketa_activate_more"><br/>';
+                echo '<div class="bottom16">' . $lang['srv_activation_expire'] . $expire . '</div>';
+                echo '<div class="bottom16" id="div_anketa_activate_more">';
                 printf($lang['srv_activation_setting'], $anketa);
                 echo '</div>';
         
@@ -3300,22 +3300,22 @@ class SurveyAdminAjax {
                 //echo '<script>stopActivationTimer();</script>';
 
 				# Aktivacijski pop up za vse ostale ankete
-                echo '<div id="anketa_activate_note" class="divPopUp">';
+                echo '<div id="anketa_activate_note" class="divPopUp PopUpNarrow">';
                 
                 echo '<div class="popup_close"><a href="#" onClick="anketa_activate_save(\''.$this->anketa.'\',\''.$folders.'\'); return false;">✕</a></div>';
 
 				echo '<h2>' . $lang['srv_activation_header'] . '.</h2>';
 				
 				// GDPR opozorilo ce ni potencialno GDPR
-				echo '<p class="bold">';
+				echo '<p class="semi-bold bottom16">';
 				printf($lang['srv_activation_text_nongdpr'], $anketa);
                 echo '</p>';
-                echo '<p class="bold">';
+                echo '<p class="semi-bold">';
 				echo $lang['srv_activation_text_nongdpr2'];
 				echo '</p>';
 
-				echo '<div>' . $lang['srv_activation_expire'] .'<b>'.$expire.'</b></div>';
-				echo '<div id="div_anketa_activate_more"><br/>';
+				echo '<div class="bottom16">' . $lang['srv_activation_expire'] .'<b>'.$expire.'</b></div>';
+				echo '<div class="bottom16" id="div_anketa_activate_more">';
 				printf($lang['srv_activation_setting'], $anketa);
 				echo '</div>';
 
@@ -3368,11 +3368,13 @@ class SurveyAdminAjax {
 			echo '</div>';
             
             // Timer counter
-			echo '<div id="divAvtoClose" active="1" >'.$lang['srv_activate_duration_autostart'].': <span>10</span> s.</div>';
+			echo '<div class="top16 bottom16" id="divAvtoClose" active="1" >'.$lang['srv_activate_duration_autostart'].': <span>10</span> s.</div>';
             
             // Gumb zapri
-            echo '<div class="buttonwrapper buttons_holder"><a class="ovalbutton ovalbutton_orange" href="#" onclick="anketa_activate_save(\''.$this->anketa.'\',\''.$folders.'\'); return false;"><span>' . $lang['srv_zapri'] . '</span></a></div>';
-			
+			echo '<div class="button_holder">';
+			echo '<button class="medium blue" onClick="anketa_activate_save(\''.$this->anketa.'\',\''.$folders.'\'); return false;">'.$lang['srv_zapri'].'</button>';
+			echo '</div>';
+
 			echo '</div>';
 			
 		} elseif ($_GET['a'] == 'anketa_save_activation') {
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 94550f89b..296991957 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -10638,15 +10638,16 @@ class SurveyAdminSettings {
 		$lockSurvey = (int)UserSetting::getInstance()->getUserSetting('lockSurvey');
 		
 		if ($admin_type == '0' || $admin_type == '1') {
-			echo '<p>';
-			echo '<label><input type="checkbox" onclick="changeSurveyLock(this)" '.($lockSurvey == 1 ? ' checked="checekd"' : '').'>';
+			echo '<div class="setting_holder">';
+			echo '<input type="checkbox" onclick="changeSurveyLock(this)" '.($lockSurvey == 1 ? ' checked="checekd"' : '').'>';
+			echo '<label>';
 			echo $lang['srv_survey_lock_note'];
 			echo '</label>';
-			echo '</p>';
+			echo '</div>';
         }
         
 		if ((int)$lockSurvey > 0) {
-			echo '<p class="small">'.$lang['srv_unlock_popup'].'</p>';
+			echo '<p class="top16">'.$lang['srv_unlock_popup'].'</p>';
 		}
 	}
 	
diff --git a/lang/1.php b/lang/1.php
index 0ccbaadc4..1b810e4d7 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5164,13 +5164,13 @@ $lang = array (
 	'srv_inv_dashboard_list_cnt_title'			=> ". pošiljanje.",
 	'srv_activation_header'						=> "Anketo ste aktivirali! Aktivna bo 3 mesece",
 	'srv_activation_expire'						=> "Anketa poteče dne: ",
-	'srv_activation_setting'					=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">tukaj</span></a>.",
+	'srv_activation_setting'					=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\">tukaj</a>.",
 	'srv_activation_header_gdpr'				=> "Anketo ste aktivirali! Aktivna bo 3 mesece",
 	'srv_activation_text_gdpr'					=> "Anketa vsebuje vprašanja oz. nastavitve, ki kažejo na zbiranje osebnih podatkov. Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">tukaj</span></a>.",
-	'srv_activation_text_nongdpr'				=> "Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">tukaj</span></a>.",
-	'srv_activation_text_nongdpr2'				=> "V skladu z GDPR uredbo upoštevajte naslednje:<ul><li>Obdelujte le tiste osebne podatke, ki so nujno potrebni za izvedbo ankete. </li><li>Podatke lahko obdelujte le za namen, za katerega so bili podatki pridobljeni.</li></ul><a href=\"https://www.1ka.si/d/sl/gdpr\"><b>Več >></b></a>",
+	'srv_activation_text_nongdpr'				=> "Če v anketi zbirate osebne podatke, gre za GDPR anketo in morate izpolniti dodatne nastavitve. GDPR nastavitve ankete lahko urejate <a href=\"index.php?anketa=%1s&a=gdpr_settings\">tukaj</a>.",
+	'srv_activation_text_nongdpr2'				=> "V skladu z GDPR uredbo upoštevajte naslednje:<ul><li>Obdelujte le tiste osebne podatke, ki so nujno potrebni za izvedbo ankete. </li><li>Podatke lahko obdelujte le za namen, za katerega so bili podatki pridobljeni.</li><li><a href=\"https://www.1ka.si/d/sl/gdpr\">Več >></a></li></ul>",
 	'srv_activation_expire_gdpr'				=> "Anketa poteče dne: ",
-	'srv_activation_setting_gdpr'				=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">tukaj</span></a>.",	
+	'srv_activation_setting_gdpr'				=> "Nastavitve aktivnosti lahko spremenite <a href=\"index.php?anketa=%1s&a=trajanje\">tukaj</a>.",	
 	'srv_mass_input' 							=>	"Masovno (hitro) izpolnjevanje ankete",
 	'srv_mass_input_0' 							=>	"Izključeno",
 	'srv_mass_input_1' 							=>	"Vključeno",
@@ -5937,7 +5937,7 @@ $lang = array (
 	"srv_delete_infotext"						=>	'Namesto izbrisa svetujemo izbiro ustreznih enot',
 	"srv_unlock"								=>	"Odkleni",
 	"srv_unlock_alert"							=>	"Pri urejanju ankete z že zbranimi podatki je potrebno biti posebej pazljiv! Ob brisanju vprašanj ali kategorij se bodo izbrisali tudi pripadajoči podatki respondentov. Želite nadaljevati?",
-	"srv_unlock_popup"							=>	"Vaša anketa se je z aktivacijo zaklenila, urejanje ankete je možno, če jo odklenete s klikom na <img src=\"img_0/lock.png\">",
+	"srv_unlock_popup"							=>	"Vaša anketa se je z aktivacijo zaklenila.<br>Urejanje ankete je možno, če jo odklenete s klikom na <span class=\"faicon lock_close blue\"></span>.",
 	"srv_unlock_popup2"							=>	"Pri urejanju ankete z že zbranimi podatki je potrebno biti posebej pazljiv! Ob brisanju vprašanj ali kategorij se bodo izbrisali tudi pripadajoči podatki respondentov. Urejanje ankete je zopet možno, če jo odklenete s klikom na odkleni.",
 	"srv_unlock_popup3"							=>	"Anketa je zaklenjena. Nimate dovoljenja za odklepanje ankete.",
 	"srv_unlock_mobile"							=>	"Anketa je ustvarjena z mobilno aplikacijo. Če anketo odklenete, bo postala navadna anketa in je ne bo več mogoče urejati z mobilno aplikacijo.",
diff --git a/lang/2.php b/lang/2.php
index 663276248..60ac11470 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5138,9 +5138,9 @@ $lang = array (
 	'srv_activation_expire'						=> "Survey expires on: ",
 	'srv_activation_setting'					=> "Activities settings can be changed <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">here</span></a>.",
 	'srv_activation_header_gdpr'				=> "Survey has been activated! It will be active for 3 months",
-	'srv_activation_text_gdpr'					=> "The survey contains questions or settings that indicate the collection of personal information. If you collect personal information in the survey, this falls under GDPR and you need to set additional settings. You can edit GDPR settings <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">here</span></a>.",
+	'srv_activation_text_gdpr'					=> "The survey contains questions or settings that indicate the collection of personal information. If you collect personal information in the survey, this falls under GDPR and you need to set additional settings. You can edit GDPR settings <a href=\"index.php?anketa=%1s&a=gdpr_settings\">here</a>.",
 	'srv_activation_text_nongdpr'				=> "If you collect personal information in the survey, this falls under GDPR and you need to set additional settings. You can edit GDPR settings <a href=\"index.php?anketa=%1s&a=gdpr_settings\"><span class=\"bold\">here</span></a>.",
-    'srv_activation_text_nongdpr2'				=> "In accordance with the GDPR regulation, consider the following:<ul><li>Only process personal data that are strictly necessary for the purpose of conducting the survey.</li><li>Only process the data for the purpose for which the data was obtained.</li></ul><a href=\"https://www.1ka.si/d/en/gdpr\"><b>More >></b></a>",
+    'srv_activation_text_nongdpr2'				=> "In accordance with the GDPR regulation, consider the following:<ul><li>Only process personal data that are strictly necessary for the purpose of conducting the survey.</li><li>Only process the data for the purpose for which the data was obtained.</li><li><a href=\"https://www.1ka.si/d/en/gdpr\">More >></a><li></ul>",
     'srv_activation_expire_gdpr'				=> "Survey expires on: ",
 	'srv_activation_setting_gdpr'				=> "Activities settings can be changed <a href=\"index.php?anketa=%1s&a=trajanje\"><span class=\"bold\">here</span></a>.",
 	'srv_edit_labels'							=>	"Edit labels",