diff --git a/admin/survey/classes/tracking/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php
index 4d0eecb69..23c507e09 100644
--- a/admin/survey/classes/tracking/UserTrackingClass.php
+++ b/admin/survey/classes/tracking/UserTrackingClass.php
@@ -45,6 +45,9 @@ class UserTrackingClass
         // Izvoz v Excel
         echo '<p>'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
 
+        echo '<div id="table-tracking-wrapper1">';
+        echo '<div id="table-tracking-wrapper2">';
+
 
         echo '<table id="tracking">';
 
@@ -72,6 +75,9 @@ class UserTrackingClass
 
         echo '</table>';
 
+        echo '</div';
+        echo '</div';
+
         echo '</fieldset>';
         
         echo '<br class="clr" />';
diff --git a/public/css/admin.css b/public/css/admin.css
index e92fbadbb..edec5d37a 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -29730,9 +29730,21 @@ table.analysis_reports > tbody > tr > td {
     margin: 10px 30px;
   }
 
-  #div_archive_content.tracking table {
-    display: block;
+  #table-tracking-wrapper1 {
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+  }
+
+  #table-tracking-wrapper2 {
+    display: table-cell;
     overflow-x: auto;
+    width: 100%;
+  }
+
+  #table-tracking-wrapper2 table {
+    width: 100%;
+    border-collapse: collapse;
     white-space: nowrap;
   }
 
diff --git a/resources/sass/admin/mobile/pages/settings_profile.scss b/resources/sass/admin/mobile/pages/settings_profile.scss
index 23a8a7d7b..0a10f3f1d 100644
--- a/resources/sass/admin/mobile/pages/settings_profile.scss
+++ b/resources/sass/admin/mobile/pages/settings_profile.scss
@@ -1,8 +1,18 @@
 // Zadnjih 25 sprememb tabela - horizontal scroll
-#div_archive_content.tracking {
-	table {
-		display: block;
-    	overflow-x: auto;
-    	white-space: nowrap;
-    }
-}
\ No newline at end of file
+  #table-tracking-wrapper1 {
+	display: table;
+	table-layout: fixed;
+	width: 100%;
+  }
+  
+  #table-tracking-wrapper2 {
+	display: table-cell;
+	overflow-x: auto;
+	width: 100%;
+  }
+
+  #table-tracking-wrapper2 table {
+	width: 100%;
+	border-collapse: collapse;
+	white-space: nowrap;
+  }
\ No newline at end of file