diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 604e34f78..c471f7539 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -4205,17 +4205,16 @@ class SurveyAdminSettings {
 	function arhivi_data() {
 		global $lang;
 		
-		echo '<fieldset style="width:100%">';
+		echo '<fieldset>';
 		echo '<legend>' . $lang['srv_arhiv_data'] . '</legend>';
-		
-		echo '<p style="margin-bottom:5px;"><span class="bold spaceRight" style="margin-top:5px;">' . $lang['srv_backup_data_label'] . '</span></p>';
-		
-		echo '<span class="floatLeft spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="ajax.php?anketa=' . $this->anketa . '&a=backup_data" onclick="create_archive_survey_data(\'' . $this->anketa .'\',\'' . $lang['srv_wait_a_moment'] .'\'); return false;">';
-		echo $lang['srv_backup_data_button'];
-		echo '</a></div></span>';
 
-		echo '<br /><br />';
+		echo '<p class="bottom16">'.$lang['srv_backup_data_text'].'</p>';
+
+		echo '<div class="button_holder bottom16">';
+		echo '<button class="medium blue" type="button" href="ajax.php?anketa=' . $this->anketa . '&a=backup_data" onclick="create_archive_survey_data(\'' . $this->anketa .'\',\'' . $lang['srv_wait_a_moment'] .'\'); return false;">'.$lang['srv_backup_data_label'].'</button>';
+		echo '</div>';
 		
+		// Seznam ustvarjenih arhivov - 2. faza: kdo je arhiviral, opomba, možnost izbrisa
 		$backups = array();
 		if ($handle = opendir( dirname(__FILE__) . '/SurveyBackup/' )) {
 		    while (false !== ($entry = readdir($handle))) {
@@ -4229,13 +4228,37 @@ class SurveyAdminSettings {
 		    closedir($handle);
 		}	
 		if (count($backups) > 0) {
-			echo '<br /><span class="bold">' . $lang['srv_backup_data_list'] . ':</span>';
+			echo '<p class="bold">' . $lang['srv_backup_data_list'] . ':</p>';
+
+			echo '<table id="survey_data_archives_table">';
+
+			echo '<tr>';
+			echo '<th>'.$lang['srv_questionnaire_archives_date'].'</th>';
+			echo '<th></th>';
+			echo '</tr>';
+
 			foreach ($backups AS $file) {
 				$e = explode('-', $file);
 				$e[2] = str_replace('.1ka', '', $e[2]);
-				echo '<br /><span style="padding-left:10px;">'.$e[1].' '.$e[2].' - <a href="ajax.php?anketa='.$this->anketa.'&a=backup_restore&filename='.$file.'">'.$lang['srv_anketarestoredata'].'</a></span>';
+				$e[2] = str_replace('.', ':', $e[2]);
+				$e[2] = substr($e[2], 0, -3);
+
+				echo '<tr>';
+				echo '<td>'.$e[1].' '.$e[2].'</td>';
+
+
+				//Ikone
+				echo '<td class="right">';
+				echo '<div class="icon_holder multiple">';
+				//echo '<a class="faicon" href="#" onclick="delete_funkcija_todo"><span class="faicon trash empty"></span></a>';
+				echo '<button class="table-inline white-black caps" type="button" onclick="window.location.href=\'ajax.php?anketa='.$this->anketa.'&a=backup_restore&filename='.$file.'\'">'.$lang['srv_questionnaire_archives_activate'].'</button>';
+				echo '</div>';
+				echo '</td>';
+				
+				echo '</tr>';
+
 			}
-			echo '<br /><br />';
+			echo '</table>';
 		}
 		
 		echo '</fieldset>';
diff --git a/lang/1.php b/lang/1.php
index 9db575744..b9848644a 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2351,7 +2351,8 @@ $lang = array (
     "srv_deletefolder"      =>	 "Izbri&#154;i mapo",
     "srv_backup"         	=>	 "Kreiraj arhivsko anketo",
     "srv_backup_label"      =>	 "Izdelava arhivske verzije vprašalnika:",
-    "srv_backup_data_label" =>	 "Izdelava arhivske kopije podatkov:",
+    "srv_backup_data_text" =>	 "Pred spreminjanjem vprašalnika ali urejanjem podatkov lahko obstoječo verzijo podatkov shranite tako, da izdelate arhivsko verzijo. S klikom na 'Izdelaj arhivsko verzijo podatkov' se v spodnjem seznamu generira arhivska verzija vprašalnika in podatkov. Vsako arhivsko verzijo vprašalnika lahko aktivirate. Z aktivacijo se arhivska verzija avtomatsko ustvari kot nova anketa.",
+    "srv_backup_data_label" =>	 "Izdelaj arhivsko verzijo podatkov",
     "srv_backup_button"     =>	 "Izdelaj arhivsko verzijo vprašalnika",
     "srv_backup_data_button"=>	 "Izdelaj arhivsko kopijo podatkov",
     "srv_concl_link"        =>	 "Ob koncu ankete",
diff --git a/lang/2.php b/lang/2.php
index 1faaefac2..fd3ae1ef0 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2336,7 +2336,8 @@ $lang = array (
     "srv_deletefolder"      =>  "Delete folder",
     "srv_backup"         	=>  "Create backup survey",
     "srv_backup_label"      =>  "Create archive version of the questionnaire:",
-	"srv_backup_data_label" =>	"Create archive version of data:",
+	"srv_backup_data_text" =>	"Before modifying the questionnaire or editing the data, you can save the existing version of the data by creating an archive version. Clicking on 'Create archive version of data' will generate an archive version of the questionnaire and data in the list below. Each archive version of the questionnaire can be activated. By activating it, the archive version is automatically created as a new survey.",
+	"srv_backup_data_label" =>	"Create archive version of data",
     "srv_backup_button"     =>  "Create archive",
     "srv_backup_data_button"=>  "Create data archive",
     "srv_concl_link"        =>  "Close survey instead of link",