diff --git a/admin/survey/classes/class.SurveyRecoding.php b/admin/survey/classes/class.SurveyRecoding.php
index 92c42207e..0d6dc6649 100644
--- a/admin/survey/classes/class.SurveyRecoding.php
+++ b/admin/survey/classes/class.SurveyRecoding.php
@@ -475,21 +475,21 @@ class SurveyRecoding
 				}
 				
 			}
-			
 		}
+
 		if (count($all_recoded) == 0) {
 			echo $lang['srv_recode_summary_nothing'];
-		} else {
+		} 
+        else {
 			#var_dump($all_recoded);#
-			echo '<span id="div_recent_recoding_1" class="as_link" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggle();">+ '.$lang['srv_recode_summary'].'</span>';
-			echo '<span id="div_recent_recoding_2" class="as_link displayNone" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggle();">- '.$lang['srv_recode_summary'].'</span>';
+			echo '<span id="div_recent_recoding_1" class="as_link" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggleClass(\'displayNone\');">+ '.$lang['srv_recode_summary'].'</span>';
+			echo '<span id="div_recent_recoding_2" class="as_link displayNone" onclick="$(\'#div_recent_recoding, #div_recent_recoding_1, #div_recent_recoding_2\').toggleClass(\'displayNone\');">- '.$lang['srv_recode_summary'].'</span>';
 			echo '<div id="div_recent_recoding" class="displayNone">';
 			foreach ($all_recoded AS $msg) {
 				echo $msg['txt']."<br/>";
 			}
 			echo '</div>';
 		}
-
 	}
 	
 	function enableRecodeVariable() {
diff --git a/admin/survey/classes/class.SurveyThemeEditor.php b/admin/survey/classes/class.SurveyThemeEditor.php
index 9abbfa784..da2c978cf 100644
--- a/admin/survey/classes/class.SurveyThemeEditor.php
+++ b/admin/survey/classes/class.SurveyThemeEditor.php
@@ -309,7 +309,7 @@ class SurveyThemeEditor {
 
 			echo '<div class="setting_box">';
 
-			echo $lang['srv_te_question_border'].':<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 auto-save" name="question_border'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 			echo '<option value="" '.(''==$row['value']?' selected':'').'>'.$lang['srv_te_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>';
@@ -323,7 +323,7 @@ class SurveyThemeEditor {
 			echo '<div class="setting_box">';
 
             echo $lang['srv_te_custom_icon_pc'] . ': ';
-            echo '<select class="dropdown large" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">
+            echo '<select class="dropdown large auto-save" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'">
                 <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['srv_te_default'].'</option>
                 <option value="18" '.($row['value'] == 18 ? " selected":"").'>18 px</option>
                 <option value="21" '.($row['value'] == 21 ? " selected":"").'>21 px</option>
@@ -340,7 +340,7 @@ class SurveyThemeEditor {
         } elseif($type == 8) {
 			echo '<div class="setting_box">';
             echo $lang['srv_te_custom_icon_mobile'] . ': ';
-            echo '<select class="dropdown large" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">
+            echo '<select class="dropdown large auto-save" id="izbira-checkbox-gumbov" data-id="'.$id.'" data-type="'.$type.'">
                 <option value="0" '.(($row['value'] == 0 || is_null($row['value'])) ? " selected":"").'>'.$lang['srv_te_default'].'</option>
                 <option value="21" '.($row['value'] == 20 ? " selected":"").'>20 px</option>
                 <option value="25" '.($row['value'] == 25 ? " selected":"").'>25 px</option>
@@ -357,7 +357,7 @@ class SurveyThemeEditor {
 			echo '<div class="setting_box">';
 
 				echo $lang['srv_te_custom_border_size'].': ';
-				echo '<select class="dropdown large" name="bordersize'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+				echo '<select class="dropdown large auto-save" name="bordersize'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 				echo '<option value=""'.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 				for ($i=1; $i<=6; $i++) {
 					echo '<option value="'.$i.'"'.($i==$row['value']?' selected':'').'>'.$i.'px</option>';
@@ -369,7 +369,7 @@ class SurveyThemeEditor {
 			echo '<div class="setting_box">';
 
 			echo $lang['srv_te_custom_border_radius'].': ';
-			echo '<select class="dropdown large" name="borderradius'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo '<select class="dropdown large auto-save" name="borderradius'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 			echo '<option value=""'.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 			for ($i=5; $i<=30; $i+=5) {
 				echo '<option value="'.$i.'"'.($i==$row['value']?' selected':'').'>'.$i.'px</option>';
@@ -382,7 +382,7 @@ class SurveyThemeEditor {
 			echo '<div class="setting_box">';
 
 			echo $lang['srv_te_custom_font_style_keywords'].': ';
-			echo '<select class="dropdown large" name=""keyword_style'.$id.'" data-id="'.$id.'" data-type="'.$type.'" class="auto-save">';
+			echo '<select class="dropdown large auto-save" name=""keyword_style'.$id.'" data-id="'.$id.'" data-type="'.$type.'">';
 			echo '<option value=""'.(''==$row['value']?' selected':'').'>'.$lang['srv_te_default'].'</option>';
 			echo '<option value="bold" '.('bold'==$row['value']?' selected':'').'>'.$lang['srv_te_custom_font_style_keywords_bold'].'</option>';
 			echo '<option value="italic" '.('italic'==$row['value']?' selected':'').'>'.$lang['srv_te_custom_font_style_keywords_italic'].'</option>';
diff --git a/main/survey/app/Controllers/HeaderController.php b/main/survey/app/Controllers/HeaderController.php
index 48001b305..e844e5c05 100644
--- a/main/survey/app/Controllers/HeaderController.php
+++ b/main/survey/app/Controllers/HeaderController.php
@@ -469,15 +469,15 @@ class HeaderController extends Controller
                             break;
 
                         case '2':
-                            echo '.spremenljivka';
+                            echo '.spremenljivka .naslov';
                             break;
 
                         case '3':
-                            echo '.variable_holder';
+                            echo '.variable_holder .variabla';
                             break;
 
                         case '4':
-                            echo 'table.grid_table tbody tr:nth-child(2n+1)';
+                            echo 'table.grid_table tbody tr:nth-child(2n+1), .variable_holder .variabla';
                             break;
 
                         case '5':
@@ -524,7 +524,7 @@ class HeaderController extends Controller
                             break;
 
                         case '4':
-                            echo 'font-size: ' . $rowt['value'] . '%;';
+                            echo 'font-size: ' . $rowt['value'] . '% !important;';
                             break;
 
                         case '5':