diff --git a/public/mod/data/field/latlong/field.class.php b/public/mod/data/field/latlong/field.class.php
index 6d2b10a3779..ae51073fe4d 100644
--- a/public/mod/data/field/latlong/field.class.php
+++ b/public/mod/data/field/latlong/field.class.php
@@ -78,7 +78,7 @@ class data_field_latlong extends data_field_base {
         }
         $str = '<div title="'.s($this->field->description).'">';
         $str .= '<fieldset><legend><span class="accesshide">'.s($this->field->name).'</span></legend>';
-        $str .= '<table class="d-flex flex-wrap align-items-center"><tr><td align="right">';
+        $str .= '<table class="d-flex flex-wrap align-items-center table-reboot"><tr><td align="right">';
         $classes = 'mod-data-input form-control-static';
         $str .= '<label for="field_'.$this->field->id.'_0" class="' . $classes . '">' . get_string('latitude', 'data');
         if ($this->field->required) {
diff --git a/public/mod/data/field/url/field.class.php b/public/mod/data/field/url/field.class.php
index 993a4658084..5cdd25485c1 100644
--- a/public/mod/data/field/url/field.class.php
+++ b/public/mod/data/field/url/field.class.php
@@ -96,7 +96,7 @@ class data_field_url extends data_field_base {
         $label .= '</label>';
 
         if ($autolinkable) {
-            $str .= '<table><tr><td align="right">';
+            $str .= '<table class="table-reboot"><tr><td align="right">';
             $str .= '<span class="mod-data-input">' . get_string('url', 'data') . ':</span>';
             if (!empty($image)) {
                 $str .= $image;
diff --git a/public/mod/data/lib.php b/public/mod/data/lib.php
index af45d5dc727..0528192c3e1 100644
--- a/public/mod/data/lib.php
+++ b/public/mod/data/lib.php
@@ -1830,7 +1830,7 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
 
     echo '<br />';
     echo '<div class="' . $advancedsearchclass . '" id="data_adv_form">';
-    echo '<table class="boxaligncenter">';
+    echo '<table class="table-reboot">';
 
     // print ASC or DESC
     echo '<tr><td colspan="2">&nbsp;</td></tr>';