diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 27808fdcc..86c344256 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -9777,48 +9777,47 @@ class SurveyAdminSettings {
 		echo '</select>';
 		echo '</div>';
 
-        // Napredni vmesnik (star design za moje ankete)
 		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_settings_interfaceshow'] . ':</span>';
+
+        // Prikaži ikono za jezik v navigacijski vrstici ankete, desno zgoraj
+		echo '<div class="setting_item">';
 		echo '<input name="showLanguageShortcut" type="hidden" value="0">';
         echo '<input id="showLanguageShortcut" name="showLanguageShortcut" type="checkbox" value="1" '.($showLanguageShortcut == 1?' checked="checked"':'').'>';
 		echo '<label for="showLanguageShortcut">'.$lang['srv_settings_language_shortcut'].'</label>';
 		echo '</div>';
 
-        // Prikaži ikono za jezik v navigacijski vrstici ankete, desno zgoraj
-		echo '<div class="setting_holder">';
-		echo '<input name="lockSurvey" type="hidden" value="0">';
-        echo '<input name="lockSurvey" id="lockSurvey" type="checkbox" value="1" '.($lockSurvey == 1?' checked="checked"':'').'>';
-        echo '<label for="lockSurvey">'.$lang['srv_lock_survey_when_activate'].'</label>';
-		echo '</div>';
-				
 		// Opcija enklik ustvarjanja ankete (v mojih anketah)
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input name="oneclickCreateMySurveys" type="hidden" value="0">';
 		echo '<input id="oneclickCreateMySurveys" name="oneclickCreateMySurveys" type="checkbox" value="1" '.($oneclickCreateMySurveys == 1?' checked="checked"':'').'>';
 		echo '<label for="oneclickCreateMySurveys">'.$lang['srv_settings_oneClickCreate'].'</label>';
 		echo '</div>';
 
-        // Možnost prikaza SA ikone pri vseh anketah
+		// Možnost prikaza SA ikone pri vseh anketah
         if($admin_type < 3) {
             $showSAicon = UserSetting::getInstance()->getUserSetting('showSAicon');
 
-			echo '<div class="setting_holder">';
+			echo '<div class="setting_item">';
 			echo '<input name="showSAicon" type="hidden" value="0">';
             echo '<input id="showSAicon" name="showSAicon" type="checkbox" value="1" ' . ($showSAicon == 1 ? ' checked="checked"' : '') . '>';
             echo '<label for="showSAicon">' . $lang['srv_settings_showSAicon'] .'</label>';
 			echo '</div>';
         }
+
+		echo '</div>';
 		
 		echo '</fieldset>';
 		
 		
 		echo '<fieldset><legend>'.$lang['srv_survey_settings'].'</legend>';
 
-		echo '<p class="bottom16">'.$lang['srv_settings_oncreation'].'</p>';
-		
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_settings_oncreation'] . ':</span>';
+
 		// Aktivna anketa ob aktivaciji - TO PUSTIMO SAMO ADMINOM ZARADI GDPR OPOZORILA OB AKTIVACIJI
 		if($admin_type == '0'){
-			echo '<div class="setting_holder">';
+			echo '<div class="setting_item">';
 			echo '<input name="autoActiveSurvey" type="hidden" value="0">';
 			echo '<input id="autoActiveSurvey" name="autoActiveSurvey" type="checkbox" value="1" '.($autoActiveSurvey == 1?' checked="checked"':'').'>';
 			echo '<label for="autoActiveSurvey">'.$lang['srv_settings_autoActiveSurvey'].'</label>';
@@ -9826,33 +9825,47 @@ class SurveyAdminSettings {
 		}
 		
 		// Komentarji aktivirani ob kreaciji ankete
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input name="activeComments" type="hidden" value="0">';
 		echo '<input id="activeComments" name="activeComments" type="checkbox" value="1" '.($activeComments == 1?' checked="checked"':'').'>';
 		echo '<label for="activeComments">'.$lang['srv_settings_activeComments'].'</label>';
 		echo '</div>';
 
 		// Uvod ob aktivaciji prikazan
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input name="showIntro" type="hidden" value="0">';
 		echo '<input id="showIntro" name="showIntro" type="checkbox" value="1" '.($showIntro == 1?' checked="checked"':'').'>';
 		echo '<label for="showIntro">'.$lang['srv_create_show_intro'].'</label>';
 		echo '</div>';
 
 		// Zakljucek ob aktivaciji prikazan
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input name="showConcl" type="hidden" value="0">';
 		echo '<input id="showConcl" name="showConcl" type="checkbox" value="1" '.($showConcl == 1?' checked="checked"':'').'>';
 		echo '<label for="showConcl">'.$lang['srv_create_show_concl'].'</label>';
 		echo '</div>';
 
 		// Ime ob aktivaciji prikazano za respondente
-		echo '<div class="setting_holder">';
+		echo '<div class="setting_item">';
 		echo '<input name="showSurveyTitle" type="hidden" value="0">';
 		echo '<input name="showSurveyTitle" type="checkbox" value="1" '.($showSurveyTitle == 1?' checked="checked"':'').'>';
 		echo '<label>'.$lang['srv_create_show_title'].'</label>';
 		echo '</div>';
 
+		echo '</div>';
+
+		echo '<div class="setting_holder">';
+		echo '<span class="setting_title">'.$lang['srv_settings_onactivation'] . ':</span>';
+
+		// Zaklep urejanja ob aktivaciji
+		echo '<div class="setting_item">';
+		echo '<input name="lockSurvey" type="hidden" value="0">';
+        echo '<input name="lockSurvey" id="lockSurvey" type="checkbox" value="1" '.($lockSurvey == 1?' checked="checked"':'').'>';
+        echo '<label for="lockSurvey">'.$lang['srv_lock_survey_when_activate'].'</label>';
+		echo '</div>';
+
+		echo '</div>';
+
 		echo '</fieldset>';
 		
 		echo '</form>';
diff --git a/lang/1.php b/lang/1.php
index e2d563619..abe590bf3 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -5786,7 +5786,7 @@ $lang = array (
 	"srv_user_notbanned"						=>	"Uporabnik je aktiven",
 	"srv_displayifs"							=>	"Prikaži pogoje in bloke pred vprašanjem",
 	"srv_user_settings"							=>	"Nastavitve uporabnika",
-	"srv_lock_survey_when_activate"				=>	"Zakleni urejanje ankete ob aktivaciji",
+	"srv_lock_survey_when_activate"				=>	"Zakleni urejanje ankete",
 	"srv_validation"							=>	"Validacija",
 	"srv_validation_no"							=>	"Vprašanje nima nastavljenih validacijskih omejitev",
 	"srv_validation_new"						=>	"Dodaj validacijo",
@@ -6666,12 +6666,14 @@ $lang = array (
 	'more2'										=>	'Več',
 	'srv_settings_activity'						=>	'Aktivnost / kvote',
 	'srv_settings_oncreation'					=>	'Ob kreaciji ankete',
+	'srv_settings_onactivation'					=>	'Ob aktivaciji ankete',
 	'srv_settings_autoActiveSurvey'				=>	'Anketa je aktivna',
 	'srv_settings_activeComments'				=>	'Komentarji so vklopljeni',
 	'srv_settings_advancedMySurveys'			=>	'Napredni vmesnik za "Moje ankete"',
+	'srv_settings_interfaceshow'				=>	'V vmesniku prikaži',
 	'srv_settings_oneClickCreate'				=>	'Možnost kreiranja ankete z enim klikom (ENKLIK kreiranje)',
-	'srv_settings_language_shortcut' 			=> 	'Prikaži ikono za izbiro jezika v statusni vrstici ankete',
-	'srv_settings_showSAicon'					=> 	'Prikaži ikono za hitro aktiviranje SA modula',
+	'srv_settings_language_shortcut' 			=> 	'Ikono za izbiro jezika v statusni vrstici ankete',
+	'srv_settings_showSAicon'					=> 	'Ikono za hitro aktiviranje SA modula',
 	'srv_language_mySurveys'					=>	'Jezik za "Moje ankete" lahko urejate v <a href="index.php?a=nastavitve&m=global_user_settings">nastavitvah uporabnika</a>',
 	'srv_public_link_title'						=>	'Javne povezave do podatkov',
 	'srv_public_link_noLink'					=>	'Anketa še nima povezav!',
diff --git a/lang/2.php b/lang/2.php
index 88d65936d..7e2c24148 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -5683,7 +5683,7 @@ $lang = array (
 	"srv_user_notbanned"						=>	"User is not banned",
 	"srv_displayifs"							=>	"Display conditions and blocks above the question",
 	"srv_user_settings"							=>	"User settings",
-	"srv_lock_survey_when_activate"				=>	"Lock survey editing upon activation",
+	"srv_lock_survey_when_activate"				=>	"Lock survey editing",
 	"srv_validation"							=>	"Validation",
 	"srv_validation_no"							=>	"Question does not have any validations",
 	"srv_validation_new"						=>	"New validation",
@@ -6550,13 +6550,15 @@ $lang = array (
 	'more'										=>	'',
 	'more2'										=>	'More',
 	'srv_settings_activity'						=>	'Activity / quotas',
-	'srv_settings_oncreation'					=>	'After survey creation',
+	'srv_settings_oncreation'					=>	'On survey creation',
+	'srv_settings_onactivation'					=>	'On survey activation',
 	'srv_settings_autoActiveSurvey'				=>	'Survey is active',
 	'srv_settings_activeComments'				=>	'Comments are enabled',
 	'srv_settings_advancedMySurveys'			=>	'Advanced interface for "My surveys"',
+	'srv_settings_interfaceshow'				=>	'Elements to display in the interface',
 	'srv_settings_oneClickCreate'				=>	'Option to create a survey with one click (ONECLICK Creation)',
-	'srv_settings_language_shortcut' 			=> 	'Show the language selection icon in the survey status bar',
-	'srv_settings_showSAicon'					=> 	'Show icon for quick activation of SA module',
+	'srv_settings_language_shortcut' 			=> 	'The language selection icon in the survey status bar',
+	'srv_settings_showSAicon'					=> 	'The icon for quick activation of SA module',
 	'srv_language_mySurveys'					=>	'Language for "My surveys" can be edited in <a href="index.php?a=nastavitve&m=global_user_settings">user settings</a>',
 	'srv_public_link_title'						=>	'Public links to data',
 	'srv_public_link_noLink'					=>	"Survey doesn't have any links!",