diff --git a/admin/survey/classes/tracking/TrackingClass.php b/admin/survey/classes/tracking/TrackingClass.php
index 5d5bd8a9f..d3721f110 100644
--- a/admin/survey/classes/tracking/TrackingClass.php
+++ b/admin/survey/classes/tracking/TrackingClass.php
@@ -120,9 +120,12 @@ class TrackingClass
         echo '<fieldset>';
         echo '<legend>' . $lang['srv_survey_archives_tracking_' . $this->sub] . '</legend>';
 
-        // Izvoz v Excel
-        echo '<p><a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">Download Excel</a></p>';
+        echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text2'].' <a href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download">'.$lang['srv_survey_archives_tracking_survey_text3'].'</a>.</p>';
 
+        // Izvoz v Excel
+        echo '<div class="izvoz_nad_tabelo">';
+        echo '<a class="noline" href="index.php?anketa=' . $this->anketa . '&a=' . $_GET['a'] . '&d=download"><span class="faicon xls green link-right"></span>'.$lang['srv_export_excel'].'</a>';
+        echo '</div>';
 
         echo '<table id="tracking">';
 
@@ -197,12 +200,12 @@ class TrackingClass
                 } else
                     $recnum = 0;
 
-                echo '	<td>' . datetime($row['datetime']) . '</td>';
+                echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
                 echo '	<td>' . $rowu['name'] . ' ' . $rowu['surname'] . '</td>';
                 echo '	<td class="center">' . $row['ip'] . '</td>';
                 echo '	<td class="center">' . $recnum . '</td>';
-                echo '	<td>' . $row['get'] . '</td>';
-                echo '	<td>' . $row['post'] . '</td>';
+                echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
+                echo '	<td><div class="postget_wrap">' . $row['post'] . '</div></td>';
 
                 echo '</tr>';
             }
@@ -233,7 +236,7 @@ class TrackingClass
             // Prva vrstica
             echo '<tr>';
             echo '	<th>' . $lang['date'] . '</th>';
-            echo '	<th>User</th>';
+            echo '	<th>' . $lang['user'] . '</th>';
             echo '	<th class="center">IP</th>';
             echo '	<th class="center">Podstran</th>';
             echo '	<th>GET</th>';
@@ -242,20 +245,22 @@ class TrackingClass
 
             // Vrstice s podatki
             $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC");
+            $count = 0;
             while ($row = mysqli_fetch_array($sql)) {
-                echo '<tr>';
+                echo '<tr '.($count > 24 ? 'class="displayNone"' : '').'>';
 
                 $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'");
                 $rowu = mysqli_fetch_array($sqlu);
 
-                echo '	<td>' . datetime($row['datetime']) . '</td>';
-                echo '	<td>' . $rowu['name'] . ' ' . $rowu['surname'] . '</td>';
+                echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
+                echo '	<td><div class="no_wrap">' . $rowu['name'] . ' ' . $rowu['surname'] . '</div></td>';
                 echo '	<td class="center">' . $row['ip'] . '</td>';
                 echo '	<td class="center">' . $statuses[$row['status']] . '</td>';
-                echo '	<td>' . $row['get'] . '</td>';
-                echo '	<td>' . $row['post'] . '</td>';
+                echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
+                echo '	<td><div class="postget_wrap">' . $row['post'] . '</div></td>';
 
                 echo '</tr>';
+                $count++;
             }
         }
 
diff --git a/admin/survey/classes/tracking/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php
index a4fe93fe3..e2608a876 100644
--- a/admin/survey/classes/tracking/UserTrackingClass.php
+++ b/admin/survey/classes/tracking/UserTrackingClass.php
@@ -65,10 +65,10 @@ class UserTrackingClass
         while ($row = mysqli_fetch_array($sql)) {
             echo '<tr>';
 
-            echo '	<td><div class="myprofile_date_wrap">' . datetime($row['datetime']) . '</div></td>';
+            echo '	<td><div class="no_wrap">' . datetime($row['datetime']) . '</div></td>';
             echo '	<td class="center">' . $row['ip'] . '</td>';
-            echo '	<td><div class="myprofile_postget_wrap">' . $row['get'] . '</div></td>';
-            echo '	<td><div class="myprofile_postget_wrap">' . $row['post'] . '</div></td>';
+            echo '	<td><div class="postget_wrap">' . $row['get'] . '</div></td>';
+            echo '	<td><div class="postget_wrap">' . $row['post'] . '</div></td>';
 
             echo '</tr>';
         }
diff --git a/lang/1.php b/lang/1.php
index 68606af4a..a942ca45f 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -4095,6 +4095,9 @@ $lang = array (
 	"srv_survey_archives_ie_data_title"		=>	"Izvoz vprašalnika in podatkov",
 	"srv_survey_archives_tracking"		=>	"Spremembe",
 	"srv_survey_archives_tracking_survey"	=>	"Spremembe vprašalnika",
+	"srv_survey_archives_tracking_survey_text1"	=>	"V spodnji tabeli je navedenih zadnjih 25 sprememb v vprašalniku.",
+	"srv_survey_archives_tracking_survey_text2"	=>	"Za vpogled v vse spremembe prenesite",
+	"srv_survey_archives_tracking_survey_text3"	=>	"Excel datoteko",
 	"srv_survey_archives_tracking_data"		=>	"Spremembe podatkov",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (uvozi)",
     "srv_survey_archives_tracking_hierarchy"            =>	"Spremembe samoevalvacije v šolah",
@@ -5576,7 +5579,7 @@ $lang = array (
 	"srv_data_delete_not_selected"				=>	"Niste izbrali nobenega respondenta!",
 	"srv_if_error"								=>	"Dopolnite ali odstranite pogoj!",
 	"srv_export_spss"							=>	"Izvozi v spss",
-	"srv_export_excel"							=>	"Izvozi v excel",
+	"srv_export_excel"							=>	"Izvozi v Excel",
 	"srv_export_txt"							=>	"Izvozi v tekstovno datoteko",
 	"srv_expaned_text"							=>	"Priporočamo vam tudi uporabo skrčenega pogleda",
 	"srv_library_q_added"						=>	"Vprašanje uspešno dodano v knjižnico!",
diff --git a/lang/2.php b/lang/2.php
index 510aada8e..278aad624 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -4076,6 +4076,9 @@ $lang = array (
 	"srv_survey_archives_ie_data_title"		=>	"Survey and data import / export",
 	"srv_survey_archives_tracking"		=>	"Changes",
 	"srv_survey_archives_tracking_survey"	=>	"Survey changes",
+	"srv_survey_archives_tracking_survey_text1"	=>	"The table below shows the last 25 changes to the survey.",
+	"srv_survey_archives_tracking_survey_text2"	=>	"To see all the changes, download the",
+	"srv_survey_archives_tracking_survey_text3"	=>	"Excel file",
 	"srv_survey_archives_tracking_data"		=>	"Data changes",
 	"srv_survey_archives_tracking_append"	=>	"Append/Merge (imports)",
     "srv_survey_archives_tracking_hierarchy"            =>	"Changes in self-evaluation in schools",
@@ -5532,7 +5535,7 @@ $lang = array (
 	"srv_data_delete_not_selected"				=>	"You have not selected respondent!",
 	"srv_if_error"								=>	"Edit or remove condition!",
 	"srv_export_spss"							=>	"Export to spss",
-	"srv_export_excel"							=>	"Export to excel",
+	"srv_export_excel"							=>	"Export to Excel",
 	"srv_export_txt"							=>	"Export to text file",
 	"srv_expaned_text"							=>	"We recommend switching to collapsed view",
 	"srv_library_q_added"						=>	"Question added to library!",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d1c02e3d1..012bdc7ee 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5196,6 +5196,10 @@ span.faicon.ultra_dark_gray,
 a.faicon.ultra_dark_gray {
   color: #555555;
 }
+span.faicon.green,
+a.faicon.green {
+  color: #00C437;
+}
 span.faicon.fa-stack,
 a.faicon.fa-stack {
   height: 1em;
@@ -10940,6 +10944,11 @@ and open the template in the editor.
   border-bottom: 1px #D3D3D3 solid;
 }
 
+div.izvoz_nad_tabelo {
+  display: flex;
+  justify-content: flex-end;
+}
+
 /*
     Branching ikone, radio, checkboxi...
 */
@@ -14147,16 +14156,15 @@ div #user_info_segment .user_info {
 div #user_info_segment .user_info.text {
   margin-right: 50px;
 }
-div .myprofile_postget_wrap {
+div .postget_wrap {
   max-width: 320px;
-  min-width: 320px;
   overflow-wrap: break-word;
   white-space: normal;
   padding: 8px 0px;
   font-family: "Courier";
   font-size: 12px;
 }
-div .myprofile_date_wrap {
+div .no_wrap {
   width: auto;
   white-space: nowrap;
 }
diff --git a/resources/sass/admin_new/basic/colors.scss b/resources/sass/admin_new/basic/colors.scss
index 15503c997..1d9e36bd6 100644
--- a/resources/sass/admin_new/basic/colors.scss
+++ b/resources/sass/admin_new/basic/colors.scss
@@ -22,5 +22,6 @@ $light-gray: #F8F8F8;
 $yellow: #FFC700;
 $red: #FF0000;
 $light-red: #FFEFEF;
+$green: #00C437;
 $light-green: #a8eea8;
 
diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss
index 3a3351e6b..8fb1f4573 100644
--- a/resources/sass/admin_new/basic/icons/icons.scss
+++ b/resources/sass/admin_new/basic/icons/icons.scss
@@ -52,6 +52,9 @@ a.faicon{
     &.ultra_dark_gray {
         color: $ultra-dark-gray;
     }
+    &.green {
+        color: $green;
+    }
 
     //STACKING
     &.fa-stack {
diff --git a/resources/sass/admin_new/pages/my_surveys/archives.scss b/resources/sass/admin_new/pages/my_surveys/archives.scss
new file mode 100644
index 000000000..d51b847b3
--- /dev/null
+++ b/resources/sass/admin_new/pages/my_surveys/archives.scss
@@ -0,0 +1,4 @@
+div.izvoz_nad_tabelo {
+    display:flex;
+    justify-content: flex-end;
+}
\ No newline at end of file
diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
index ef918e580..a2392ebc9 100644
--- a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
+++ b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss
@@ -1,3 +1,4 @@
 @import "top_buttons";
 @import "top_filters";
-@import "survey_list";
\ No newline at end of file
+@import "survey_list";
+@import "archives";
diff --git a/resources/sass/admin_new/pages/settings/moj_profil.scss b/resources/sass/admin_new/pages/settings/moj_profil.scss
index 7e9329d1c..a5e7b8339 100644
--- a/resources/sass/admin_new/pages/settings/moj_profil.scss
+++ b/resources/sass/admin_new/pages/settings/moj_profil.scss
@@ -31,9 +31,8 @@ div {
     }
 
 
-    .myprofile_postget_wrap {
+    .postget_wrap {
         max-width: 320px;
-        min-width: 320px;
         overflow-wrap: break-word;
         white-space: normal;
         padding: 8px 0px;
@@ -42,7 +41,7 @@ div {
         font-size: 12px;
     }
 
-    .myprofile_date_wrap {
+    .no_wrap {
         width: auto;
         white-space: nowrap;
     }