diff --git a/admin/survey/classes/class.SurveyThemeEditor.php b/admin/survey/classes/class.SurveyThemeEditor.php
index e5f9d2b01..fdc9168fa 100644
--- a/admin/survey/classes/class.SurveyThemeEditor.php
+++ b/admin/survey/classes/class.SurveyThemeEditor.php
@@ -69,7 +69,7 @@ class SurveyThemeEditor {
 		echo '<div id="picker"></div>';
 			
 		echo '<h3>'.$lang['srv_skinname'].'</h3>';
-		echo '<input type="text" class="text large" id="skin-name" name="skin-name" value="'.$rowa['name'].'" onblur="te_change_name(this);">';
+		echo '<input type="text" class="text medium" id="skin-name" name="skin-name" value="'.$rowa['name'].'" onblur="te_change_name(this);">';
 
 		// Mobilni skin nima logotipa
 		if($mobile != 1){
@@ -302,7 +302,7 @@ class SurveyThemeEditor {
 
 			echo '<div class="setting_box">';
 
-			echo '<p>'.$lang['srv_te_question_border'].'</p><select class="dropdown large" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo $lang['srv_te_question_border'].'<select class="dropdown large" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
 			echo '<option value="" '.(''==$row['value']?' selected':'').'>'.$lang['default'].'</option>';
 			echo '<option value="0" '.($row['value']=='0'?' selected':'').'>'.$lang['srv_te_question_border_0'].'</option>';
 			echo '<option value="1" '.($row['value']=='1'?' selected':'').'>'.$lang['srv_te_question_border_1'].'</option>';
diff --git a/lang/1.php b/lang/1.php
index 8864054a6..4776543c0 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -6187,7 +6187,8 @@ $lang = array (
 	'srv_te_survey_h_text'						=>	'Naslov ankete',
 	'srv_te_outer_frame'						=>	'Zunanji okvir',
 	'srv_te_question_text'						=>	'Besedilo vprašanja',
-	'srv_te_question_border'					=>	'Vprašanja',
+	'srv_te_question'							=>	'Vprašanja',
+	'srv_te_question_border'					=>	'Obroba',
 	'srv_te_question_border_0'					=>	'Brez',
 	'srv_te_question_border_1'					=>	'Črta',
 	'srv_te_question_border_2'					=>	'Okvir',
diff --git a/lang/2.php b/lang/2.php
index b9543091d..f4712f1d0 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -6106,7 +6106,8 @@ $lang = array (
 	'srv_te_custom_font_style_keywords_bold'	=>  'Bold',
 	'srv_te_custom_font_style_keywords_italic'	=> 	'Italic',
 	'srv_te_custom_font_style_keywords_underline'=> 'Underline',
-	'srv_te_question_border'					=>	'Questions',
+	'srv_te_question'							=>	'Questions',
+	'srv_te_question_border'					=>	'Border',
 	'srv_te_question_border_0'					=>	'None',
 	'srv_te_question_border_1'					=>	'Line',
 	'srv_te_question_border_2'					=>	'Frame',
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 0d5f52747..121b93428 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10633,7 +10633,8 @@ div#theme-edit-wrap div#theme-editor div.columns {
   display: flex;
   flex-direction: row;
   width: 80%;
-  gap: 32px 16px;
+  font-size: 14px !important;
+  gap: 32px;
 }
 div#theme-edit-wrap div#theme-editor div.columns.top16 {
   margin-top: 16px;
@@ -10678,6 +10679,8 @@ div#theme-edit-wrap div#theme-editor #picker {
   position: fixed;
   left: 500px;
   z-index: 999;
+  border-radius: 2px;
+  box-shadow: 0px 0px 5px 0px #C4C4C4;
 }
 div#theme-edit-wrap div#theme-editor #picker .popup_close {
   position: absolute !important;
diff --git a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
index 6ac79245c..16a598a1d 100644
--- a/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
+++ b/resources/sass/admin_new/pages/my_surveys/oblika_teme.scss
@@ -313,7 +313,9 @@ div#theme-edit-wrap{
             flex-direction: row;
             width: 80%;
 
-            gap: 32px 16px;
+            font-size: 14px !important;
+
+            gap: 32px;
 
             &.top16 {
                 margin-top: 16px;
@@ -365,6 +367,8 @@ div#theme-edit-wrap{
             position: fixed;
             left: 500px;
             z-index: 999;
+            border-radius: 2px;
+            box-shadow: 0px 0px 5px 0px $dark-gray;
         }
 
         div.button_holder {