diff --git a/mod/glossary/formats/continuous/continuous_format.php b/mod/glossary/formats/continuous/continuous_format.php
index 8883dc4dcf2..90002d1bc76 100644
--- a/mod/glossary/formats/continuous/continuous_format.php
+++ b/mod/glossary/formats/continuous/continuous_format.php
@@ -4,9 +4,9 @@ function glossary_show_entry_continuous($course, $cm, $glossary, $entry, $mode="
 
     global $USER;
 
-    echo "\n<table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"0\" align=\"center\">\n";
+    echo '<table class="glossarypost continuous" align="center">';
     echo "<tr valign=\"top\">\n";
-    echo "<td width=\"100%\" valign=\"top\"\n";
+    echo '<td width="100%" valign="top" class="entry">';
     glossary_print_entry_approval($cm, $entry, $mode);
     glossary_print_entry_attachment($entry,"html","right");
     echo "<b>";
diff --git a/mod/glossary/formats/dictionary/dictionary_format.php b/mod/glossary/formats/dictionary/dictionary_format.php
index dd7a428a3fa..766a7df158b 100644
--- a/mod/glossary/formats/dictionary/dictionary_format.php
+++ b/mod/glossary/formats/dictionary/dictionary_format.php
@@ -4,9 +4,9 @@ function glossary_show_entry_dictionary($course, $cm, $glossary, $entry, $mode='
 
     global $CFG, $USER;
 
-    echo '<table border="0" width="95%" cellspacing="0" cellpadding="3" class="forumpost" align="center">';
+    echo '<table class="glossarypost dictionary" align="center">';
     echo '<tr valign="top">';
-    echo '<td width="100%" valign="top" bgcolor="#FFFFFF">';
+    echo '<td width="100%" valign="top" class="entry">';
     glossary_print_entry_approval($cm, $entry, $mode);
     glossary_print_entry_attachment($entry,'html','right');
     echo '<b>';
diff --git a/mod/glossary/formats/encyclopedia/encyclopedia_format.php b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
index 52c9be1a036..edec56c09b0 100644
--- a/mod/glossary/formats/encyclopedia/encyclopedia_format.php
+++ b/mod/glossary/formats/encyclopedia/encyclopedia_format.php
@@ -7,7 +7,7 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
     $user = get_record("user", "id", $entry->userid);
     $strby = get_string("writtenby", "glossary");
 
-    echo "\n<br /><table border=\"0\" width=\"95%\" cellspacing=\"0\" cellpadding=\"3\" class=\"forumpost\" align=\"center\">";
+    echo '<table class="glossarypost encyclopedia" align="center">';
 
     echo "\n<tr valign=\"top\">";
     echo "\n<td width=\"35\" valign=\"top\" class=\"forumpostpicture\">";
@@ -21,7 +21,7 @@ function glossary_show_entry_encyclopedia($course, $cm, $glossary, $entry, $mode
         glossary_print_entry_concept($entry);
         echo "</b><br />";
     
-        echo "<font size=\"2\">$strby " . fullname($user, isteacher($course->id)) . "</font>";
+        echo "$strby " . fullname($user, isteacher($course->id));
         echo "&nbsp;&nbsp;<font size=\"1\">(".get_string("lastedited").": ".
              userdate($entry->timemodified).")</font>";
         echo "</td>";
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index 79f1e232e24..d90cb0d81d0 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -1276,10 +1276,10 @@ for ($row = 0; $row < $numrows; $row++) {
       </td>
     </tr>
     <tr>
-      <td width="100%" class="glossaryentryheader"><hr /></td>
+      <td width="100%" class="entryboxheader"><hr /></td>
     </tr>
     <tr>
-      <td width="100%" class="glossaryentry">
+      <td width="100%" class="entrybox">
           <center>
 <?php
 }
diff --git a/theme/standard/styles_color.css b/theme/standard/styles_color.css
index bfab9c55e97..dfea84e5139 100644
--- a/theme/standard/styles_color.css
+++ b/theme/standard/styles_color.css
@@ -327,15 +327,16 @@ th {
     color:#CCCCCC;
 }
 
-.glossaryentryheader {
+.entryboxheader {
     border-color: #BBBBBB;
 }
 
-.glossaryentry {
+.entrybox {
     border-color: #BBBBBB;
 }
 
 
+
 /* lang, forum */
 .teacheronly {
     color:#990000;
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 211ee5484c3..f9d588cb5ee 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -441,16 +441,27 @@ dialouge, exercise, forum, lesson, quiz */
     white-space: nowrap;
 }
 
-.glossaryentryheader {
+.entryboxheader {
     border-width: 1px 1px 0px 1px;
     border-style: solid;
 }
 
-.glossaryentry {
+.entrybox {
     border-width: 0px 1px 1px 1px;
     border-style: solid;
 }
 
+.glossarypost {
+    width: 95%;
+    border-width:1px;
+    border-style:solid;
+    border-collapse:separate;
+}
+
+.glossarypost .entry {
+    padding: 3px;
+}
+
 
 /* message */
 .message_link {
diff --git a/theme/standard/styles_moz.css b/theme/standard/styles_moz.css
index 92a3a1fbe0b..3680b227463 100644
--- a/theme/standard/styles_moz.css
+++ b/theme/standard/styles_moz.css
@@ -70,12 +70,14 @@
     -moz-border-radius-topright:15px;
 }
 
-.glossaryentryheader {
+.entryboxheader {
     -moz-border-radius-topleft:10px;
     -moz-border-radius-topright:10px;
 }
 
-.glossaryentry {
+.entrybox {
+    -moz-border-radius-bottomleft:10px;
+    -moz-border-radius-bottomright:10px;
 }
 
 #calendar .eventlist .eventfull {