diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 908aa9c39..9d3fa39b4 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -3024,23 +3024,23 @@ class SurveyAdmin
         echo '<span class="menu_left-title">'.$lang['srv_survey_archives'].'</span>';
 
         # SPSS
-        echo '<li ' . ($_GET['m'] == M_EXPORT_SPSS ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_SPSS ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_SPSS . '" title="' . $lang['srv_lnk_spss'] . '"><span>' . $lang['srv_lnk_spss'] . '</span></a></li> ';
 
         # SPSS SAV
-        echo '<li ' . ($_GET['m'] == M_EXPORT_SAV ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_SAV ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_SAV . '" title="' . $lang['srv_lnk_sav'] . '"><span>' . $lang['srv_lnk_sav'] . '</span></a></li> ';
 
         # EXCEL - XLS
-        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL_XLS ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL_XLS ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_EXCEL_XLS . '" title="' . $lang['srv_lnk_excel_xls'] . '"><span>' . $lang['srv_lnk_excel_xls'] . '</span></a></li> ';
 
         # EXCEL - CSV
-        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_EXCEL ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_EXCEL . '" title="' . $lang['srv_lnk_excel'] . '"><span>' . $lang['srv_lnk_excel'] . '</span></a></li> ';
 
         # TXT
-        echo '<li ' . ($_GET['m'] == M_EXPORT_TXT ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_EXPORT_TXT ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA_EXPORT . '&m=' . M_EXPORT_TXT . '" title="' . $lang['srv_lnk_txt'] . '"><span>' . $lang['srv_lnk_txt'] . '</span></a></li> ';
 
         echo '</ul>';
@@ -3055,19 +3055,19 @@ class SurveyAdmin
 
         echo '<ul>';
         # kalkulacija - nove spremenljivke
-        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_CALCULATION ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_CALCULATION ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=' . M_COLLECT_DATA_CALCULATION . '" title="' . $lang['srv_data_subnavigation_calculaion'] . '"><span>' . $lang['srv_data_subnavigation_calculaion'] . '</span></a></li> ';
 
         # kodiranje - coding
-        echo '<li ' . ($_GET['m'] == 'coding_auto' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'coding_auto' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=coding_auto" title="' . $lang['srv_auto_coding'] . '"><span>' . $lang['srv_auto_coding'] . '</span></a></li> ';
 
         # kodiranje - coding
-        echo '<li ' . ($_GET['m'] == 'coding' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'coding' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=coding" title="' . $lang['srv_hand_coding'] . '"><span>' . $lang['srv_hand_coding'] . '</span></a></li> ';
 
         # rekodiranje - recoding
-        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == M_COLLECT_DATA_RECODING || $_GET['m'] == M_COLLECT_DATA_RECODING_DASHBOARD ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=' . M_COLLECT_DATA_RECODING . '" title="' . $lang['srv_data_subnavigation_recode'] . '"><span>' . $lang['srv_data_subnavigation_recode'] . '</span></a></li> ';
 
         echo '</ul>';
@@ -3083,11 +3083,11 @@ class SurveyAdmin
         echo '<ul>';
 
         # append
-        echo '<li ' . ($_GET['m'] == 'append' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'append' || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=append" title="' . $lang['srv_data_subnavigation_append'] . '"><span>' . $lang['srv_data_subnavigation_append'] . '</span></a></li> ';
 
         # merge
-        echo '<li ' . ($_GET['m'] == 'merge' ? ' class="highlightLineTab"' : ' class="nonhighlight"') . '>';
+        echo '<li ' . ($_GET['m'] == 'merge' ? ' class="active"' : '') . '>';
         echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_COLLECT_DATA . '&m=merge" title="' . $lang['srv_data_subnavigation_merge'] . '"><span>' . $lang['srv_data_subnavigation_merge'] . '</span></a></li> ';
 
         echo '</ul>';
@@ -3303,7 +3303,7 @@ class SurveyAdmin
             # Volitve
             global $mysql_database_name;
             if ($admin_type == 0 || $mysql_database_name == 'test1kasi') {
-                echo '<li ' . ($get == A_VOTING ? 'class="active"' : ' class="nonhighlight"') . '>';
+                echo '<li ' . ($get == A_VOTING ? 'class="active"' : '') . '>';
                 echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_VOTING.'" title="' . $lang['srv_vrsta_survey_type_18'] . '" '.(!$userAccess->checkUserAccess($what='voting') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_18'] . '</a></li> ';
             }
 
diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index e9e20704b..dfbfb16e0 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -4770,7 +4770,7 @@ class SurveyAdminSettings {
 			echo '<div class="export_indent">';
 			echo '<p>'.$lang['srv_izvoz_step1_SPSS'].'</p>';
 			echo '<div class="button_holder">';
-			echo '<button class="medium blue caps" onclick="doSpssExport(\'yes\'); return false;">'.$lang['srv_izvoz_step1_SPSS_file'].'</button>';              
+			echo '<button class="medium blue" onclick="doSpssExport(\'yes\'); return false;">'.$lang['srv_izvoz_step1_SPSS_file'].'</button>';              
 			echo '</div>';
 			echo '</div>';
 
@@ -4778,7 +4778,7 @@ class SurveyAdminSettings {
 			echo '<div class="export_indent">';
 			echo '<p>'.$lang['srv_izvoz_step2a_SPSS'].'</p>';
 			echo '<div class="button_holder">';
-			echo '<button class="medium blue caps" onclick="doSpssExport(\'no\'); return false;">'.$lang['srv_izvoz_step2_SPSS_file'].'</button>';              
+			echo '<button class="medium blue" onclick="doSpssExport(\'no\'); return false;">'.$lang['srv_izvoz_step2_SPSS_file'].'</button>';              
 			echo '</div>';
 			echo '<p class="top16">'.$lang['srv_izvoz_step2b_SPSS'].'</p>';
 			echo '</div>';