diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php
index 8edb9b7c47..760596406e 100644
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@@ -2082,7 +2082,7 @@ class Results
             return;
         }
 
-        $th_class[] = 'right';
+        $th_class[] = 'text-right';
     }
 
     /**
@@ -3498,7 +3498,7 @@ class Results
     ) {
         if (! isset($column) || $column === null) {
             $cell = $this->buildNullDisplay(
-                'right ' . $class,
+                'text-right ' . $class,
                 $condition_field,
                 $meta,
                 ''
@@ -3508,7 +3508,7 @@ class Results
             $where_comparison = ' = ' . $column;
 
             $cell = $this->getRowData(
-                'right ' . $class,
+                'text-right ' . $class,
                 $condition_field,
                 $analyzed_sql_results,
                 $meta,
@@ -3525,7 +3525,7 @@ class Results
             );
         } else {
             $cell = $this->buildEmptyDisplay(
-                'right ' . $class,
+                'text-right ' . $class,
                 $condition_field,
                 $meta,
                 ''
diff --git a/templates/database/tracking/tables.twig b/templates/database/tracking/tables.twig
index 08c417ac78..21c6d01c4a 100644
--- a/templates/database/tracking/tables.twig
+++ b/templates/database/tracking/tables.twig
@@ -32,7 +32,7 @@
                                     {{ version.table_name }}
                                 </label>
                             </th>
-                            <td class="right">
+                            <td class="text-right">
                                 {{ version.version }}
                             </td>
                             <td>
diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
index 5cd401507b..056d405c6c 100644
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@@ -52,7 +52,7 @@
             <td class="text-center print_ignore">
                 <input type="checkbox" class="checkall" name="selected_fld[]" value="{{ row['Field'] }}" id="checkbox_row_{{ rownum }}">
             </td>
-            <td class="right">{{ rownum }}</td>
+            <td class="text-right">{{ rownum }}</td>
             <th class="nowrap">
                 <label for="checkbox_row_{{ rownum }}">
                     {% if displayed_fields[rownum].comment is defined %}
diff --git a/templates/table/tracking/report_table.twig b/templates/table/tracking/report_table.twig
index 19e33274b0..f016885abd 100644
--- a/templates/table/tracking/report_table.twig
+++ b/templates/table/tracking/report_table.twig
@@ -11,7 +11,7 @@
     <tbody>
         {% for entry in entries %}
             <tr class="noclick">
-                <td class="right"><small>{{ entry.line_number }}</small></td>
+                <td class="text-right"><small>{{ entry.line_number }}</small></td>
                 <td><small>{{ entry.date }}</small></td>
                 <td><small>{{ entry.username }}</small></td>
                 <td>{{ entry.formated_statement|raw }}</td>