diff --git a/public/mod/glossary/editcategories.php b/public/mod/glossary/editcategories.php
index 809da94b757..cf2f952998a 100644
--- a/public/mod/glossary/editcategories.php
+++ b/public/mod/glossary/editcategories.php
@@ -162,7 +162,7 @@ if ( $hook >0 ) {
             echo "</p>";
 ?>
 
-                <table border="0" width="100" class="confirmbuttons">
+                <table border="0" width="100" class="confirmbuttons table-reboot">
                     <tr>
                         <td align="$rightalignment" style="width:50%">
                         <form id="form" method="post" action="editcategories.php">
@@ -235,7 +235,7 @@ echo $OUTPUT->heading(format_string($glossary->name), 2);
 ?>
 
 <form method="post" action="editcategories.php">
-<table width="40%" class="boxaligncenter generalbox" cellpadding="5">
+<table width="40%" class="boxaligncenter generalbox table-reboot" cellpadding="5">
         <tr>
           <th style="width:90%" align="center">
           <?php p(get_string("categories","glossary")) ?></th>
@@ -250,7 +250,7 @@ echo $OUTPUT->heading(format_string($glossary->name), 2);
     $categories = $DB->get_records("glossary_categories", array("glossaryid"=>$glossary->id), "name ASC");
 
     if ( $categories ) {
-        echo '<table width="100%">';
+        echo '<table class="table-reboot" width="100%">';
         foreach ($categories as $category) {
             $num_entries = $DB->count_records("glossary_entries_categories", array("categoryid"=>$category->id));
 ?>
@@ -286,7 +286,7 @@ echo $OUTPUT->heading(format_string($glossary->name), 2);
              $options['id'] = $cm->id;
              $options['action'] = "add";
 
-             echo "<table class=\"editbuttons\" border=\"0\"><tr><td align=\"$rightalignment\">";
+             echo "<table class=\"editbuttons table-reboot\" border=\"0\"><tr><td align=\"$rightalignment\">";
              echo $OUTPUT->single_button(new moodle_url("editcategories.php", $options), get_string("addcategory", "glossary"));
              echo "</td><td align=\"$leftalignment\">";
              unset($options['action']);
diff --git a/public/mod/glossary/formats.php b/public/mod/glossary/formats.php
index 01fafce6be8..d947f53817e 100644
--- a/public/mod/glossary/formats.php
+++ b/public/mod/glossary/formats.php
@@ -67,7 +67,7 @@ $yes = get_string("yes");
 $no  = get_string("no");
 
 echo '<form method="post" action="formats.php" id="form">';
-echo '<table width="90%" align="center" class="generalbox">';
+echo '<table width="90%" align="center" class="generalbox table-reboot">';
 ?>
 <tr>
     <td colspan="3" align="center"><strong>
diff --git a/public/mod/glossary/formats/continuous/continuous_format.php b/public/mod/glossary/formats/continuous/continuous_format.php
index 694330fc834..55f7b2dec69 100644
--- a/public/mod/glossary/formats/continuous/continuous_format.php
+++ b/public/mod/glossary/formats/continuous/continuous_format.php
@@ -4,7 +4,7 @@ function glossary_show_entry_continuous($course, $cm, $glossary, $entry, $mode='
 
     global $USER, $OUTPUT;
 
-    echo '<table class="glossarypost continuous" cellspacing="0">';
+    echo '<table class="glossarypost continuous table-reboot" cellspacing="0">';
     echo '<tr valign="top">';
     echo '<td class="entry">';
     glossary_print_entry_approval($cm, $entry, $mode);
diff --git a/public/mod/glossary/formats/dictionary/dictionary_format.php b/public/mod/glossary/formats/dictionary/dictionary_format.php
index 97aaf2aa474..0e42ab4205c 100644
--- a/public/mod/glossary/formats/dictionary/dictionary_format.php
+++ b/public/mod/glossary/formats/dictionary/dictionary_format.php
@@ -4,7 +4,7 @@ function glossary_show_entry_dictionary($course, $cm, $glossary, $entry, $mode='
 
     global $CFG, $USER, $OUTPUT;
 
-    echo '<table class="glossarypost dictionary" cellspacing="0">';
+    echo '<table class="glossarypost dictionary table-reboot" cellspacing="0">';
     echo '<tr valign="top">';
     echo '<td class="entry">';
     glossary_print_entry_approval($cm, $entry, $mode);
diff --git a/public/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/public/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index 7e2a518a17b..0cfb9ad0d69 100644
--- a/public/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/public/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -8,7 +8,7 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
     $strby = get_string('writtenby', 'glossary');
 
     if ($entry) {
-        echo '<table class="glossarypost encyclopedia" cellspacing="0">';
+        echo '<table class="glossarypost encyclopedia table-reboot" cellspacing="0">';
         echo '<tr valign="top">';
         echo '<td class="left picture">';
 
diff --git a/public/mod/glossary/formats/entrylist/entrylist_format.php b/public/mod/glossary/formats/entrylist/entrylist_format.php
index aae1cc0c007..c02d4c27713 100644
--- a/public/mod/glossary/formats/entrylist/entrylist_format.php
+++ b/public/mod/glossary/formats/entrylist/entrylist_format.php
@@ -5,7 +5,7 @@ function glossary_show_entry_entrylist($course, $cm, $glossary, $entry, $mode=''
 
     $return = false;
 
-    echo '<table class="glossarypost entrylist" cellspacing="0">';
+    echo '<table class="glossarypost entrylist table-reboot" cellspacing="0">';
 
     echo '<tr valign="top">';
     echo '<td class="entry">';
diff --git a/public/mod/glossary/formats/faq/faq_format.php b/public/mod/glossary/formats/faq/faq_format.php
index c9ed8ca0676..95d413c0381 100644
--- a/public/mod/glossary/formats/faq/faq_format.php
+++ b/public/mod/glossary/formats/faq/faq_format.php
@@ -4,7 +4,7 @@ function glossary_show_entry_faq($course, $cm, $glossary, $entry, $mode="", $hoo
     global $USER, $OUTPUT;
     if ( $entry ) {
 
-        echo '<table class="glossarypost faq" cellspacing="0">';
+        echo '<table class="glossarypost faq table-reboot" cellspacing="0">';
 
         echo '<tr valign="top">';
         echo '<th class="entryheader">';
diff --git a/public/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php b/public/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
index e72213b10ab..75f9b0991a6 100644
--- a/public/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
+++ b/public/mod/glossary/formats/fullwithauthor/fullwithauthor_format.php
@@ -8,7 +8,7 @@ function glossary_show_entry_fullwithauthor($course, $cm, $glossary, $entry, $mo
     $strby = get_string('writtenby', 'glossary');
 
     if ($entry) {
-        echo '<table class="glossarypost fullwithauthor" cellspacing="0">';
+        echo '<table class="glossarypost fullwithauthor table-reboot" cellspacing="0">';
         echo '<tr valign="top">';
 
         echo '<td class="picture">';
diff --git a/public/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php b/public/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
index cfb7b4eff44..e23c8e8164f 100644
--- a/public/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
+++ b/public/mod/glossary/formats/fullwithoutauthor/fullwithoutauthor_format.php
@@ -5,7 +5,7 @@ function glossary_show_entry_fullwithoutauthor($course, $cm, $glossary, $entry,
 
 
     if ($entry) {
-        echo '<table class="glossarypost fullwithoutauthor" cellspacing="0">';
+        echo '<table class="glossarypost fullwithoutauthor table-reboot" cellspacing="0">';
         echo '<tr valign="top">';
 
         echo '<th class="entryheader">';
diff --git a/public/mod/glossary/import.php b/public/mod/glossary/import.php
index 85c4f1d620d..8ee9be5209a 100644
--- a/public/mod/glossary/import.php
+++ b/public/mod/glossary/import.php
@@ -329,7 +329,7 @@ if ($xml = glossary_read_imported_file($result)) {
 
     // processed entries
     echo $OUTPUT->box_start('glossarydisplay generalbox');
-    echo '<table class="glossaryimportexport">';
+    echo '<table class="glossaryimportexport table-reboot">';
     echo '<tr>';
     echo '<td width="50%" align="right">';
     echo get_string("totalentries","glossary");
@@ -364,7 +364,7 @@ if ($xml = glossary_read_imported_file($result)) {
     // rejected entries
     if ($rejections) {
         echo $OUTPUT->heading(get_string("rejectionrpt","glossary"), 4);
-        echo '<table class="glossaryimportexport">';
+        echo '<table class="glossaryimportexport table-reboot">';
         echo $rejections;
         echo '</table><hr />';
     }
diff --git a/public/mod/glossary/lib.php b/public/mod/glossary/lib.php
index dbd3753ff76..5d5f68785bc 100644
--- a/public/mod/glossary/lib.php
+++ b/public/mod/glossary/lib.php
@@ -1359,7 +1359,7 @@ function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $mo
         $icons   = glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode, $hook,'html');
     }
     if ($aliases || $icons || !empty($entry->rating)) {
-        echo '<table>';
+        echo '<table class="table-reboot">';
         if ( $aliases ) {
             $id = "keyword-{$entry->id}";
             echo '<tr valign="top"><td class="aliases hstack gap-2">' .
@@ -1420,7 +1420,7 @@ function  glossary_print_entry_approval($cm, $entry, $mode, $align="right", $ins
 
     if ($mode == 'approval' and !$entry->approved) {
         if ($insidetable) {
-            echo '<table class="glossaryapproval" align="'.$align.'"><tr><td align="'.$align.'">';
+            echo '<table class="glossaryapproval table-reboot" align="' . $align . '"><tr><td align="' . $align . '">';
         }
         echo $OUTPUT->action_icon(
             new moodle_url('approve.php', array('eid' => $entry->id, 'mode' => $mode, 'sesskey' => sesskey())),
@@ -1914,7 +1914,7 @@ function glossary_print_categories_menu($cm, $glossary, $hook, $category) {
     $fmtoptions = array(
         'context' => $context);
 
-     echo '<table border="0" width="100%">';
+     echo '<table class="table-reboot" border="0" width="100%">';
      echo '<tr>';
 
      echo '<td align="center" style="width:20%">';
@@ -2192,7 +2192,7 @@ function glossary_print_dynaentry($courseid, $entries, $displayformat = -1) {
     global $USER, $CFG, $DB;
 
     echo '<div class="boxaligncenter">';
-    echo '<table class="glossarypopup" cellspacing="0"><tr>';
+    echo '<table class="glossarypopup table-reboot" cellspacing="0"><tr>';
     echo '<td>';
     if ( $entries ) {
         foreach ( $entries as $entry ) {
diff --git a/public/mod/glossary/locallib.php b/public/mod/glossary/locallib.php
index 46e44e5df17..44d7197d4b3 100644
--- a/public/mod/glossary/locallib.php
+++ b/public/mod/glossary/locallib.php
@@ -407,7 +407,7 @@ class glossary_entry_portfolio_caller extends portfolio_module_caller_base {
         $options->trusted = $entry->definitiontrust;
         $options->context = $context;
 
-        $output = '<table class="glossarypost dictionary" cellspacing="0">' . "\n";
+        $output = '<table class="glossarypost dictionary table-reboot" cellspacing="0">' . "\n";
         $output .= '<tr valign="top">' . "\n";
         $output .= '<td class="entry">' . "\n";
 
@@ -446,7 +446,7 @@ class glossary_entry_portfolio_caller extends portfolio_module_caller_base {
         }
         $fs = get_file_storage();
         if ($files = $fs->get_area_files($filecontext->id, 'mod_glossary', 'attachment', $entry->id, "timemodified", false)) {
-            $output .= '<table border="0" width="100%"><tr><td>' . "\n";
+            $output .= '<table border="0" width="100%" class="table-reboot"><tr><td>' . "\n";
 
             foreach ($files as $file) {
                 $output .= $format->file_output($file);
diff --git a/public/mod/glossary/view.php b/public/mod/glossary/view.php
index 2aa1839e2fe..1e02e9735cf 100644
--- a/public/mod/glossary/view.php
+++ b/public/mod/glossary/view.php
@@ -434,7 +434,7 @@ if ($allentries) {
                 // print the group break if apply
 
                 echo '<div>';
-                echo '<table cellspacing="0" class="glossarycategoryheader">';
+                echo '<table cellspacing="0" class="glossarycategoryheader table-reboot">';
 
                 echo '<tr>';
                 if ($userispivot) {