diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 8d8745864..8d4d2b59c 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -4809,7 +4809,12 @@ class SurveyAdminSettings {
 		elseif ($_GET['m'] == M_EXPORT_SAV) {	
 		
 			echo '<fieldset><legend>'.$lang['srv_lnk_sav'].'</legend>';	
-			echo $lang['srv_izvoz_SAV_note'];			
+			echo $lang['srv_izvoz_SAV_note1'];
+			echo '<div class="button_holder">';
+            echo '<button class="medium blue" onclick="doSAVExport(); return false;">'.$lang['srv_izvoz_SAV_file'].'</button>';              
+            echo '</div>';
+			echo '<p class="top16">'.$lang['srv_izvoz_SAV_note2a'].'<a href="index.php?anketa=' . $this->anketa . '&a=export&m=spss">'.$lang['srv_izvoz_SAV_note2b'].'</a>'.$lang['srv_izvoz_SAV_note2c'].'</p>';
+
 			echo '</fieldset>';
 		} 
 		elseif ($_GET['m'] == M_EXPORT_TXT) {
diff --git a/lang/1.php b/lang/1.php
index 860195d10..5b95575ac 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -1567,7 +1567,7 @@ $lang = array (
 	"export_all_excel"		=>	"Izvozi vsa polja v Excel",
 	"export_s_excel"		=>	"Izvozi v Excel",
 	"srv_lnk_excel"			=>	"CSV",
-	"srv_lnk_excel_xls"		=>	"Excel (xls)",
+	"srv_lnk_excel_xls"		=>	"EXCEL (XLS)",
 	"srv_lnk_spss"			=>	"SPSS SYNTAX",
 	"srv_lnk_sav"   		=>	"SPSS SAV",
 	"srv_lnk_PDF/RTF"		=>	"Zaporedni izpis vseh respodentov",
@@ -1601,7 +1601,11 @@ $lang = array (
 	"srv_izvoz_txt_file"			=>	"Izvoz v tekstovno datoteko",	
 	"srv_izvoz_SPSS_complex_note"	=>	"Pri izvozu zelo kompleksne ankete z zankami vam v primeru kakršnih koli težav priporočamo najprej izvoz v Excel, in nato uvoz v SPSS.",		
 	"srv_izvoz_SPSS_faq"			=>	"V primeru kakršnihkoli zapletov (npr. pri kompleksnih anketah z zankami, stare verzije SPSS) priporočamo izvoz v Excel, in nato uvoz v SPSS. To priporočamo še posebej pri kombiniranih tabelah. Več o izvozih v SPSS si lahko preberete v priročniku <a href='https://www.1ka.si/d/sl/pomoc/prirocniki/izvoz-spss' target=\"_blank\">Izvoz v SPSS</a>. V primeru težav kontaktirajte <a href=\"https://www.1ka.si/a/72864?Q1=5729900\" target=\"_blank\">Pomoč uporabnikom</a>.",		
-	"srv_izvoz_SAV_note"			=>	"Podatke v SPSS (SAV) izvozite s klikom na ukaz <a href=\"#\" onclick=\"doSAVExport(); return false;\" ><span class=\"bold\">\"Izvoz v SPSS (SAV)\"</span></a>.</p><p>Pozor: Izvoz ne omogoča izvoza label vrednosti odgovorov. </p><p class=\"semibold\">Funkcionalnost je še v razvoju, zato so možne težave pri izvozu.<br />Priporočamo uporabo (starega) izvoza v SPSS, ki generira dve lo&#269;eni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).",
+	"srv_izvoz_SAV_note1"			=>	"Podatke izvozite v SPSS SAV s klikom na spodnji ukaz:",
+	"srv_izvoz_SAV_file"			=>	"Izvoz v SPSS SAV",
+	"srv_izvoz_SAV_note2a"			=>	"<span class=\"red\">Opozorilo!</span> Izvoz ne omogoča izvoza label vrednosti odgovorov. Funkcionalnost je še v razvoju, zato so možne težave pri izvozu. Priporočamo uporabo ",
+	"srv_izvoz_SAV_note2b"			=>	"izvoza SPSS SYNTAX",
+	"srv_izvoz_SAV_note2c"			=>	", ki generira dve ločeni datoteki - datoteko s sintakso (.SPS) in datoteko s podatki (.TXT).",
 	"s_sortby_A"			=>	"Sortiraj po ",
 	"s_sortby_B"			=>	"&#269;asu",
 	"s_sortby_C"			=>	" / ",
diff --git a/lang/2.php b/lang/2.php
index 7f813d3e1..b95c69aab 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -1555,7 +1555,7 @@ $lang = array (
 	"export_all_excel"		=>	"Export all fields to Excel",
 	"export_s_excel"		=>	"Export to Excel",
 	"srv_lnk_excel"			=>	"CSV",
-	"srv_lnk_excel_xls"		=>	"Excel (xls)",
+	"srv_lnk_excel_xls"		=>	"EXCEL (XLS)",
 	"srv_lnk_spss"			=>	"SPSS SYNTAX",
 	"srv_lnk_sav"   		=>	"SPSS SAV",
 	"srv_lnk_PDF/RTF"		=>	"Respondent results",
@@ -1589,7 +1589,11 @@ $lang = array (
 	"srv_izvoz_txt_file"			=>	"Text file export",	
 	"srv_izvoz_SPSS_complex_note"	=>	"If you encounter any problems while exporting complex surveys with loops, we suggest you first export data to Excel and then import it into SPSS.",			
 	"srv_izvoz_SPSS_faq"			=>	"In case of complications (e.g. complex surveys with loops, old SPSS versions) we suggest export to Excel and then import into SPSS. We specifically recommended for multiple tables. You can find more information about SPSS exports in the <a href=\"https://www.1ka.si/d/en/help/manuals/export-to-spss\" target=\"_blank\">SPSS Export</a> manual. In case of any problems please contact <a href=\"https://www.1ka.si/d/en/help\" target=\"_blank\">Help center</a>.",			
-	"srv_izvoz_SAV_note"			=>	"Export data in SPSS (SAV) by clicking the command <a href=\"#\" onclick=\"doSAVExport(); return false;\" ><span class=\"bold\">\"Export to SPSS (SAV)\"</span></a>.</p><p class=\"semibold\">If you encounter any problems, use the (old) export in SPSS, which generates two separate files - file syntax (.SPS) and data file (.txt).",
+	"srv_izvoz_SAV_note1"			=>	"Export data in SPSS (SAV) format by clicking the button below:",
+	"srv_izvoz_SAV_file"			=>	"SPSS SAV export",
+	"srv_izvoz_SAV_note2a"			=>	"<span class=\"red\">Warning!</span> This functionality does not support the export of answer value labels. If you encounter any problems, please use the ",
+	"srv_izvoz_SAV_note2b"			=>	"SPSS SYNTAX export option",
+	"srv_izvoz_SAV_note2c"			=>	", which generates two separate files - syntax file (.SPS) and data file (.txt).",
 	"s_sortby_A"			=>	"Sort by ",
 	"s_sortby_B"			=>	"date",
 	"s_sortby_C"			=>	" / ",