diff --git a/modules/account/modules.php b/modules/account/modules.php
index f0e2a961f9..9f765f13e5 100644
--- a/modules/account/modules.php
+++ b/modules/account/modules.php
@@ -208,7 +208,7 @@ protected function output() {
         if ($this->get('internal_users')) {
             $res = '<li class="menu_change_password"><a class="unread_link" href="?page=change_password">';
             if (!$this->get('hide_folder_icons')) {
-                $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$key).'" alt="" width="16" height="16" /> ';
+                $res .= '<i class="bi bi-key-fill fs-5 me-2"></i>';
             }
             $res .= $this->trans('Password').'</a></li>';
             $this->concat('formatted_folder_list', $res);
diff --git a/modules/calendar/modules.php b/modules/calendar/modules.php
index 2b07e924ae..55fe563060 100644
--- a/modules/calendar/modules.php
+++ b/modules/calendar/modules.php
@@ -132,7 +132,7 @@ class Hm_Output_calendar_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_calendar"><a class="unread_link" href="?page=calendar">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$calendar).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-calendar-week-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Calendar').'</a></li>';
         if ($this->format == 'HTML5') {
diff --git a/modules/contacts/modules.php b/modules/contacts/modules.php
index 1038989668..af64262388 100644
--- a/modules/contacts/modules.php
+++ b/modules/contacts/modules.php
@@ -91,7 +91,7 @@ class Hm_Output_contacts_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_contacts"><a class="unread_link" href="?page=contacts">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$people).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-people-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Contacts').'</a></li>';
         if ($this->format == 'HTML5') {
@@ -128,19 +128,19 @@ protected function output() {
         $headers = $this->get('msg_headers');
         $backends = $this->get('contact_edit', array());
         if (!empty($addresses) && count($backends) > 0) {
-            $res = '<div class="add_contact_row"><a href="#" onclick="$(\'.add_contact_controls\').toggle(); return false;">'.
-                '<img width="20" height="20" src="'.Hm_Image_Sources::$people.'" alt="'.$this->trans('Add').'" title="'.
-                $this->html_safe('Add Contact').'" /></a><span class="add_contact_controls"><select id="add_contact">';
+            $res = '<div class="add_contact_row position-absolute top-0 end-0 z-3 p-2 d-flex align-content-center gap-3"><a href="#" title="'.
+            $this->html_safe('Add Contact').'" onclick="$(\'.add_contact_controls\').toggle(); return false;">'.
+                '<i class="bi bi-person-fill-add fs-3" ></i></a><div class="add_contact_controls"><div class="row g-1 mt-1"><div class="col"><select id="add_contact" class="form-select form-select-sm">';
             foreach ($addresses as $vals) {
                 $res .= '<option value="'.$this->html_safe($vals['name']).' '.$this->html_safe($vals['email']).
                     '">'.$this->html_safe($vals['name']).' &lt;'.$this->html_safe($vals['email']).'&gt;</option>';
             }
-            $res .= '</select> <select id="contact_source">';
+            $res .= '</select></div> <div class="col"><select id="contact_source" class="form-select form-select-sm">';
             foreach ($backends as $val) {
                 $res .= '<option value="'.$this->html_safe($val).'">'.$this->html_safe($val).'</option>';
             }
-            $res .= '</select> <input onclick="return add_contact_from_message_view()" class="add_contact_button" '.
-                'type="button" value="'.$this->trans('Add').'"></span></div>';
+            $res .= '</select></div> <div class="col"><input onclick="return add_contact_from_message_view()" class="add_contact_button w-100 btn btn-success btn-sm" '.
+                'type="button" value="'.$this->trans('Add Contact').'"></div></div></div></div>';
             $headers = $headers.$res;
         }
         $this->out('msg_headers', $headers, false);
@@ -158,7 +158,7 @@ protected function output() {
         }
         $per_page = 25;
         $current_page = $this->get('contact_page', 1);
-        $res = '<div class="px-4"><table class="contact_list table">';
+        $res = '<div class="px-3 mt-3"><table class="contact_list table">';
         $res .= '<tr><td colspan="7" class="contact_list_title"><div class="server_title">'.$this->trans('Contacts').'</div></td></tr>';
         $contacts = $this->get('contact_store');
         $editable = $this->get('contact_edit', array());
@@ -173,28 +173,25 @@ protected function output() {
                 $res .= '<tr class="contact_row_'.$this->html_safe($id).'">';
                 $res .= '<td><a data-id="contact_'.$this->html_safe($id).'_detail" '.
                     '" class="show_contact" title="'.$this->trans('Details').'">'.
-                    '<img alt="'.$this->trans('Send To').'" width="16" height="16" src="'.Hm_Image_Sources::$person.'" /></a> '.
+                    '<i class="bi bi-person-fill"></i> '.
                     '</d><td>'.$this->html_safe($contact->value('type')).'<td><span class="contact_src">'.
                     ($contact->value('source') == 'local' ? '' : $this->html_safe($contact->value('source'))).'</span>'.
                     '</td><td>'.$this->html_safe($name).'</td>'.
                     '<td><div class="contact_fld">'.$this->html_safe($contact->value('email_address')).'</div></td>'.
                     '<td class="contact_fld"><a href="tel:'.$this->html_safe($contact->value('phone_number')).'">'.
                     $this->html_safe($contact->value('phone_number')).'</a></td>'.
-                    '<td class="text-end">';
+                    '<td class="text-end" style="width : 100px">';
                 if (in_array($contact->value('type').':'.$contact->value('source'), $editable, true)) {
                     $res .= '<a data-id="'.$this->html_safe($id).'" data-type="'.$this->html_safe($contact->value('type')).'" data-source="'.$this->html_safe($contact->value('source')).
-                        '" class="delete_contact" title="'.$this->trans('Delete').'"><img alt="'.$this->trans('Delete').
-                        '" width="16" height="16" src="'.Hm_Image_Sources::$circle_x.'" /></a>'.
+                        '" class="delete_contact cursor-pointer" title="'.$this->trans('Delete').'"><i class="bi bi-trash3 text-danger ms-2"></i></a>'.
                         '<a href="?page=contacts&amp;contact_id='.$this->html_safe($id).'&amp;contact_source='.
                         $this->html_safe($contact->value('source')).'&amp;contact_type='.
                         $this->html_safe($contact->value('type')).'&amp;contact_page='.$current_page.
-                        '" class="edit_contact" title="'.$this->trans('Edit').'"><img alt="'.$this->trans('Edit').
-                        '" width="16" height="16" src="'.Hm_Image_Sources::$cog.'" /></a>';
+                        '" class="edit_contact cursor-pointer" title="'.$this->trans('Edit').'"><i class="bi bi-gear ms-2"></i></a>';
                 }
                 $res .= '<a href="?page=compose&amp;contact_id='.$this->html_safe($id).
                     '" class="send_to_contact" title="'.$this->trans('Send To').'">'.
-                    '<img alt="'.$this->trans('Send To').'" width="16" height="16" src="'.
-                    Hm_Image_Sources::$doc.'" /></a>';
+                    '<i class="bi bi-file-earmark-text ms-2"></i></a>';
 
                 $res .= '</td></tr>';
                 $res .= '<tr><td id="contact_'.$this->html_safe($id).'_detail" class="contact_detail_row" colspan="6">';
diff --git a/modules/contacts/site.css b/modules/contacts/site.css
index a8aedbea25..7024f9baaf 100644
--- a/modules/contacts/site.css
+++ b/modules/contacts/site.css
@@ -1,13 +1,5 @@
-/* .add_contact_form input { margin: 5px; margin-left: 0px; background-color: aqua; } */
-/* .add_contact_form { padding-top: 10px; display: block; } */
-/* .contact_list { margin-left: 35px; margin-right: 10px; margin-top: 20px; width: 50%; } */
-/* .contact_list td { white-space: nowrap; padding-right: 20px; padding-bottom: 5px; vertical-align: -5px; padding-top: 5px; border-bottom: solid 1px #ddd; } */
 .gmail_contacts { margin-top: 50px; }
-/* .contact_list_title { padding-top: 0px !important; padding-bottom: 10px; } */
 .show_contact img, .edit_contact img, .send_to_contact img, .delete_contact img { opacity: .5; margin-left: 10px; cursor: pointer; }
-/* .contact_controls { text-align: right; } */
-.add_contact_row { position: absolute; top: 22px; right: 10px; font-size: 90%; z-index: 100}
-.add_contact_row img { opacity: .4; margin-right: 10px; }
 .add_contact_controls { display: none; }
 .contact_suggestion { display: block; }
 .close_autocomplete { float: right; }
diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php
index 0338452c52..8909775e8d 100644
--- a/modules/core/message_list_functions.php
+++ b/modules/core/message_list_functions.php
@@ -606,8 +606,8 @@ function build_page_links($page_size, $current_page, $total, $path, $filter=fals
     if ($ceil > $max_pages) {
         $floor -= ($ceil - $max_pages);
     }
-    $prev = '<a class="disabled_link"><img src="'.Hm_Image_Sources::$caret_left.'" alt="&larr;" /></a>';
-    $next = '<a class="disabled_link"><img src="'.Hm_Image_Sources::$caret_right.'" alt="&rarr;" /></a>';
+    $prev = '<a class="disabled_link"><i class="bi bi-caret-left-fill"></i></a>';
+    $next = '<a class="disabled_link"><i class="bi bi-caret-right-fill"></i></a>';
 
     if ($floor > 1 ) {
         $first = '<a href="?page=message_list&amp;list_path='.urlencode($path).'&amp;list_page=1'.$keyword_str.$filter_str.$sort_str.'">1</a> ... ';
@@ -616,10 +616,10 @@ function build_page_links($page_size, $current_page, $total, $path, $filter=fals
         $last = ' ... <a href="?page=message_list&amp;list_path='.urlencode($path).'&amp;list_page='.$max_pages.$keyword_str.$filter_str.$sort_str.'">'.$max_pages.'</a>';
     }
     if ($current_page > 1) {
-        $prev = '<a href="?page=message_list&amp;list_path='.urlencode($path).'&amp;list_page='.($current_page - 1).$keyword_str.$filter_str.$sort_str.'"><img src="'.Hm_Image_Sources::$caret_left.'" alt="&larr;" /></a>';
+        $prev = '<a href="?page=message_list&amp;list_path='.urlencode($path).'&amp;list_page='.($current_page - 1).$keyword_str.$filter_str.$sort_str.'"><i class="bi bi-caret-left-fill"></i></a>';
     }
     if ($max_pages > 1 && $current_page < $max_pages) {
-        $next = '<a href="?page=message_list&amp;list_path='.urlencode($path).'&amp;list_page='.($current_page + 1).$keyword_str.$filter_str.$sort_str.'"><img src="'.Hm_Image_Sources::$caret_right.'" alt="&rarr;" /></a>';
+        $next = '<a href="?page=message_list&amp;list_path='.urlencode($path).'&amp;list_page='.($current_page + 1).$keyword_str.$filter_str.$sort_str.'"><i class="bi bi-caret-right-fill"></i></a>';
     }
     for ($i=1;$i<=$max_pages;$i++) {
         if ($i < $floor || $i > $ceil) {
@@ -627,7 +627,7 @@ function build_page_links($page_size, $current_page, $total, $path, $filter=fals
         }
         $links .= ' <a ';
         if ($i == $current_page) {
-            $links .= 'class="current_page" ';
+            $links .= 'class="current_page fw-bolder" ';
         }
         $links .= 'href="?page=message_list&amp;list_path='.urlencode($path).'&amp;list_page='.$i.$keyword_str.$filter_str.$sort_str.'">'.$i.'</a>';
     }
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index f81af30017..f23b44ae8f 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -1251,33 +1251,33 @@ protected function output() {
         if (!$single) {
             $res .= '<li class="menu_combined_inbox"><a class="unread_link" href="?page=message_list&amp;list_path=combined_inbox">';
             if (!$this->get('hide_folder_icons')) {
-                $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$box).'" alt="" width="16" height="16" /> ';
+                $res .= '<i class="bi bi-box2-fill fs-5 me-2"></i>';
             }
             $res .= $this->trans('Everything').'</a><span class="combined_inbox_count"></span></li>';
         }
-        $res .= '<li class="menu_unread"><a class="unread_link" href="?page=message_list&amp;list_path=unread">';
+        $res .= '<li class="menu_unread d-flex align-items-center"><a class="unread_link d-flex align-items-center" href="?page=message_list&amp;list_path=unread">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$env_closed).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-envelope-fill fs-5 me-2"></i>';
         }
-        $res .= $this->trans('Unread').'</a><span class="total_unread_count badge bg-secondary"></span></li>';
+        $res .= $this->trans('Unread').'</a><span class="total_unread_count badge bg-secondary ms-2 px-1"></span></li>';
         $res .= '<li class="menu_flagged"><a class="unread_link" href="?page=message_list&amp;list_path=flagged">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$star).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-flag-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Flagged').'</a> <span class="flagged_count"></span></li>';
         $res .= '<li class="menu_junk"><a class="unread_link" href="?page=message_list&amp;list_path=junk">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$junk).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-envelope-x-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Junk').'</a></li>';
         $res .= '<li class="menu_trash"><a class="unread_link" href="?page=message_list&amp;list_path=trash">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$trash).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-trash3-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Trash').'</a></li>';
         $res .= '<li class="menu_drafts"><a class="unread_link" href="?page=message_list&amp;list_path=drafts">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$draft).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-pencil-square fs-5 me-2"></i>';
         }
         $res .= $this->trans('Drafts').'</a></li>';
 
@@ -1296,7 +1296,7 @@ class Hm_Output_logout_menu_item extends Hm_Output_Module {
     protected function output() {
         $res =  '<li class="menu_logout"><a class="unread_link logout_link" href="#">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$power).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-power fs-5 me-2"></i>';
         }
         $res .= $this->trans('Logout').'</a></li>';
 
@@ -1352,7 +1352,7 @@ protected function output() {
             if ($name == 'Email' && !$single) {
                 $res .= '<li class="menu_email"><a class="unread_link" href="?page=message_list&amp;list_path=email">';
                 if (!$this->get('hide_folder_icons')) {
-                    $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$globe).'" alt="" width="16" height="16" /> ';
+                    $res .= '<i class="bi bi-globe-americas fs-5 me-2"></i>';
                 }
                 $res .= $this->trans('All').'</a> <span class="unread_mail_count"></span></li>';
             }
@@ -1379,7 +1379,7 @@ protected function output() {
             '</div><ul style="display: none;" class="settings folders">';
         $res .= '<li class="menu_home"><a class="unread_link" href="?page=home">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$home).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-house-door-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Home').'</a></li>';
         if ($this->format == 'HTML5') {
@@ -1442,7 +1442,7 @@ class Hm_Output_settings_servers_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_servers"><a class="unread_link" href="?page=servers">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$monitor).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-pc-display-horizontal fs-5 me-2"></i>';
         }
         $res .= $this->trans('Servers').'</a></li>';
         $this->concat('formatted_folder_list', $res);
@@ -1460,7 +1460,7 @@ class Hm_Output_settings_site_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_settings"><a class="unread_link" href="?page=settings">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$cog).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-gear-wide-connected fs-5 me-2"></i>';
         }
         $res .= $this->trans('Site').'</a></li>';
         $this->concat('formatted_folder_list', $res);
@@ -1481,7 +1481,7 @@ protected function output() {
         }
         $res = '<li class="menu_save"><a class="unread_link" href="?page=save">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$save).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-download fs-5 me-2"></i>';
         }
         $res .= $this->trans('Save').'</a></li>';
         $this->concat('formatted_folder_list', $res);
@@ -1546,7 +1546,7 @@ class Hm_Output_content_section_start extends Hm_Output_Module {
      * Opens a main tag for the primary content section
      */
     protected function output() {
-        return '<main class="container-fluid content_cell"><div class="offline">'.$this->trans('Offline').'</div><div class="row m-0">';
+        return '<main class="container-fluid content_cell"><div class="offline">'.$this->trans('Offline').'</div><div class="row m-0 position-relative">';
     }
 }
 
@@ -1682,7 +1682,7 @@ protected function output() {
                 $header_flds[] = '<th></th>';
             }
         }
-        $res = '<table class="message_table">';
+        $res = '<div class="p-3"><table class="message_table table pt-5">';
         if (!$this->get('no_message_list_headers')) {
             if (!empty($col_flds)) {
                 $res .= '<colgroup>'.implode('', $col_flds).'</colgroup>';
@@ -1800,7 +1800,7 @@ class Hm_Output_message_list_end extends Hm_Output_Module {
      * Close the table opened in Hm_Output_message_list_start
      */
     protected function output() {
-        $res = '</tbody></table><div class="page_links"></div></div>';
+        $res = '</tbody></table></div><div class="mb-5 page_links d-flex justify-content-center gap-3 align-content-center"></div></div>';
         return $res;
     }
 }
diff --git a/modules/core/site.css b/modules/core/site.css
index 7ec88623df..8c4536f087 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -41,9 +41,7 @@ td { vertical-align: top; }
 #theme_setting, #timezone_setting { max-width: 200px; }
 .s_pre { color: #666}
 .message_table > thead > tr > th { display: none; }
-.message_table > tbody > tr > td { cursor: pointer; padding: 5px; padding-left: 10px; padding-top: 5px; padding-bottom: 3px; color: #333; border-bottom: solid 1px #ede8e6; }
-.message_table { table-layout: fixed; width: 100%; padding: 20px; padding-top: 15px; padding-bottom: 40px; padding-left: 20px; }
-.message_table > tbody > tr > th:hover { color: #000; }
+/* .message_table > tbody > tr > td { cursor: pointer; padding: 5px; padding-left: 10px; padding-top: 5px; padding-bottom: 3px; color: #333; border-bottom: solid 1px #ede8e6; } */
 .logout_form { white-space: nowrap; padding: 0px; margin: 0px; }
 .logout_form a { font-weight: bold; color: #666; }
 .logged_in { padding-left: 10px; float: right; padding-right: 10px; }
@@ -71,7 +69,7 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .inner_list a { padding-right: 5px; }
 .folders { margin-top: 10px; margin-bottom: 20px; margin-left: 20px !important;}
 .inner_list { margin-bottom: 10px; } 
-.folders a, .unread_link { color: #555; text-decoration: none; line-height: 1.25em; }
+/* .folders a, .unread_link { color: #555; text-decoration: none; line-height: 1.25em; } */
 .folder_list { background-color: #fff; margin-right: 20px; padding-right: 15px; padding-bottom: 40px; min-width: 200px; padding-top: 0px; }
 
 .folders, .inner_list { list-style-type: none; padding: 0px; margin-left: 10px; padding-right: 0px; }
@@ -83,7 +81,7 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .path_delim { opacity: .4; padding-left: 5px; vertical-align: 1px; padding-right: 3px; }
 .not_found { font-size: 150%; color: #999; padding: 50px; height: 100%; border-left: solid 1px #ddd; background-color: #fff; }
 .no_servers { text-align: center; padding: 50px; margin: auto; padding-bottom: 100px; }
-.selected_menu, .selected_menu a { color: teal !important; line-height: 1.25em;}
+.selected_menu, .selected_menu a { color: teal !important; line-height: 1.25em; font-weight: bolder !important;}
 .folder_list .update_message_list{ font-size: 80%; padding-top: 10px; float: right; }
 .src_name { white-space: nowrap; overflow: hidden; cursor: pointer; border-left: solid 1px #eee; padding-left: 25px; margin-top: 0px; margin-right: -15px; background: linear-gradient(180deg, #fff, #fff, #f7f2ef); border-bottom: solid 1px #ede8e6; color: #777; padding-top: 10px; font-size: 125%; letter-spacing: -1px; padding-bottom: 10px; }
 .main_menu { padding-top: 20px; }
@@ -100,9 +98,6 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .confirm_logout { display: none; background-color: #eee; padding: 20px; position: absolute; left: 0px; top: 0px; border: solid 1px #ede8e6; z-index: 100; }
 /* .confirm_text {  padding-left: 10px; padding-bottom: 10px; } */
 .folder_list .update_unread { float: right; margin-top: 20px; }
-.page_links a { text-decoration: none; color: #111; }
-.page_links a img { opacity: .6; width: 16px; height: 16px; vertical-align: -2px; }
-.page_links { text-align: center; padding-top: 20px; }
 .checkbox_cell { width: 20px; padding-right: 10px !important; }
 .menu_caret { padding: 7px; float: right; margin-right: 10px; opacity: .15; }
 .news_cell { border: none !important; padding-bottom: 10px !important; padding-top: 10px !important; }
@@ -176,7 +171,7 @@ div.unseen, .unseen .subject { font-weight: 700; }
 .home_password_dialogs { min-height: 400px; max-width: 480px; padding: 20px; margin: 20px; margin-right: 0px; float: left; border: solid 1px #eee; }
 .home_password_dialogs .pw_input { width: 120px; }
 .nux_title { font-size: 120%; margin-bottom: 20px; }
-.total_unread_count, .unread_count { background-color: #ccc; font-size: 90%; margin-left: 10px; padding: 0px; padding-bottom: 1px; border-radius: 4px 4px 4px 4px; vertical-align: 2px; font-weight: bold; color: #fff; }
+/* .total_unread_count, .unread_count { background-color: #ccc; font-size: 90%; margin-left: 10px; padding: 0px; padding-bottom: 1px; border-radius: 4px 4px 4px 4px; vertical-align: 2px; font-weight: bold; color: #fff; } */
 .debug_title { color: teal; position: fixed; background-color: #f5f5f5; bottom: 0px; right: 0px; padding: 20px; padding-left: 20px; }
 .long_session { float: left; }
 .long_session input { padding: 0px; float: none; }
@@ -227,7 +222,7 @@ div.unseen, .unseen .subject { font-weight: 700; }
 .mobile .folder_toggle { display: block; top: 0px; left: -3px; }
 .mobile .folder_toggle img { width: 24px; height: 32px; margin-top: -7px; }
 .mobile .folder_toggle { position: fixed; z-index: 101; }
-.mobile .message_table { padding-left: 5px !important; margin-top: 30px !important; }
+.mobile .message_table { padding-left: 5px !important; margin-top: 70px !important; }
 .mobile .list_settings_link, .mobile .refresh_list { width: 24px; height: 24px; vertical-align: -13px; }
 .mobile .refresh_list { margin-right: 5px; }
 .mobile .update_message_list { margin-right: 20px; }
@@ -265,8 +260,6 @@ div.unseen, .unseen .subject { font-weight: 700; }
 .mobile .imap_filter { display: none; }
 .mobile .list_controls { color: #777; background: linear-gradient(180deg, #fff, #fff, #f7f2ef); height: 48px; padding-left: 5px; padding-right: 5px; }
 .mobile .list_controls img { margin-top: 10px }
-.mobile .page_links { font-size: 150%; }
-.mobile .page_links a img { width: 24px; height: 24px; }
 .mobile .toggle_link { padding: 4px 6px !important; line-height: normal !important; margin-left: -3px !important; margin-top: -4px; position: relative; }
 .mobile .toggle_link img { vertical-align: -3px !important; width: 16px; height: 16px; margin-left: -3px !important}
 .mobile .compose_form { padding: 0px !important; padding-left: 5px !important; width: 92% !important; }
diff --git a/modules/developer/modules.php b/modules/developer/modules.php
index 0bd85f7e8e..d2df4cd8a6 100644
--- a/modules/developer/modules.php
+++ b/modules/developer/modules.php
@@ -128,7 +128,7 @@ class Hm_Output_developer_doc_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_dev"><a class="unread_link" href="?page=dev">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$bug).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-bug-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Dev').'</a></li>';
         if ($this->format == 'HTML5') {
@@ -150,7 +150,7 @@ class Hm_Output_info_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_info"><a class="unread_link" href="?page=info">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$info).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-info-circle fs-5 me-2"></i>';
         }
         $res .= $this->trans('Info').'</a></li>';
         if ($this->format == 'HTML5') {
diff --git a/modules/feeds/modules.php b/modules/feeds/modules.php
index cf464dc9d5..1be518f406 100644
--- a/modules/feeds/modules.php
+++ b/modules/feeds/modules.php
@@ -794,21 +794,21 @@ protected function output() {
         if (is_array($folders) && !empty($folders)) {
             $res .= '<li class="menu_feeds"><a class="unread_link" href="?page=message_list&amp;list_path=feeds">';
             if (!$this->get('hide_folder_icons')) {
-                $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$rss_alt).'" alt="" width="16" height="16" /> ';
+                $res .= '<i class="bi bi-rss-fill fs-5 me-2"></i>';
             }
             $res .= $this->trans('All').'</a> <span class="unread_feed_count"></span></li>';
             foreach ($this->get('feed_folders') as $id => $folder) {
                 $res .= '<li class="feeds_'.$this->html_safe($id).'">'.
                     '<a data-id="feeds_'.$this->html_safe($id).'" href="?page=message_list&list_path=feeds_'.$this->html_safe($id).'">';
                 if (!$this->get('hide_folder_icons')) {
-                    $res .= '<img class="account_icon" alt="'.$this->trans('Load Feed').'" src="'.Hm_Image_Sources::$rss.'" width="16" height="16" /> ';
+                    $res .= '<i class="bi bi-rss fs-5 me-2"></i>';
                 }
                 $res .= $this->html_safe($folder).'</a></li>';
             }
         }
         $res .= '<li class="feeds_add_new"><a href="?page=servers#feeds_section">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$plus).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-plus-square fs-5 me-2"></i>';
         }
         $res .= $this->trans('Add a feed').'</a></li>';
         if ($res) {
diff --git a/modules/highlights/modules.php b/modules/highlights/modules.php
index 4491c7affb..329dbc7666 100644
--- a/modules/highlights/modules.php
+++ b/modules/highlights/modules.php
@@ -333,7 +333,7 @@ class Hm_Output_highlight_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_highlights"><a class="unread_link" href="?page=highlights">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$tags).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-highlighter fs-5 me-2"></i>';
         }
         $res .= $this->trans('Highlights').'</a></li>';
         if ($this->format == 'HTML5') {
diff --git a/modules/history/modules.php b/modules/history/modules.php
index 07ad0dbac8..e10393f82d 100644
--- a/modules/history/modules.php
+++ b/modules/history/modules.php
@@ -181,7 +181,7 @@ class Hm_Output_history_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_history"><a class="unread_link" href="?page=history">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$history).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-clock-history fs-5 me-2"></i>';
         }
         $res .= $this->trans('History').'</a></li>';
         if ($this->format == 'HTML5') {
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index a2a2993701..28489f452c 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -824,7 +824,7 @@ protected function output() {
             foreach ($this->get('imap_folders', array()) as $id => $folder) {
                 $res .= '<li class="imap_'.intval($id).'_"><a href="#" class="imap_folder_link" data-target="imap_'.intval($id).'_">';
                 if (!$this->get('hide_folder_icons')) {
-                    $res .= '<img class="account_icon" alt="'.$this->trans('Toggle folder').'" src="'.Hm_Image_Sources::$folder.'" width="16" height="16" /> ';
+                    $res .= '<i class="bi bi-folder fs-5 me-2"></i>';
                 }
                 $res .= $this->html_safe($folder).'</a></li>';
             }
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 03acaebc9d..856663d576 100644
--- a/modules/imap/site.css
+++ b/modules/imap/site.css
@@ -13,7 +13,7 @@
 .server_subtitle { margin-bottom: 20px; color: #666; overflow: hidden; text-overflow: ellipsis}
 .msg_text { min-height: 600px; background-color: #fff; height: 100%; }
 .msg_text_inner { min-height: 300px; font-family: monospace; width: 90%; padding: 30px; padding-left: 40px; }
-.msg_headers { max-width: 100%; border-bottom: solid 1px #ddd; color: #777; padding: 0px; padding-bottom: 10px; padding-top: 10px; }
+/* .msg_headers { max-width: 100%; border-bottom: solid 1px #ddd; color: #777; padding: 0px; padding-bottom: 10px; padding-top: 10px; } */
 .imap_envelope { max-width: 100%; color: #777; padding: 0px; padding-bottom: 20px; padding-top: 0px; margin-top: -10px; }
 .imap_envelope th, .msg_headers th { vertical-align: top; padding: 3px; padding-top: 5px; padding-left: 35px; font-weight: normal; text-align: left; white-space: nowrap; padding-right: 13px; }
 .imap_envelope th { padding-left: 0px; }
@@ -23,7 +23,6 @@
 .header_links { padding-top: 10px !important; }
 .header_links a { float: none !important; padding-left: 3px !important; padding-right: 3px !important; }
 .overlay {position: fixed; height: 100%; width: 100%; z-index: 100; background-color: #ccc; opacity: .7; }
-.current_page { font-weight: bold; }
 .account_row { cursor: pointer; }
 .expand_link { display: block; width: 16px; height: 16px; float: left; margin-right: 0px; margin-left: 0px; font-size: 16px; text-align: left; }
 .header_subject th { font-size: 1.3em; padding-top: 10px; }
diff --git a/modules/imap_folders/modules.php b/modules/imap_folders/modules.php
index f833df8d68..fc5cadfa18 100644
--- a/modules/imap_folders/modules.php
+++ b/modules/imap_folders/modules.php
@@ -699,7 +699,7 @@ protected function output() {
         if ($this->get('imap_support')) {
             $res = '<li class="menu_folders"><a class="unread_link" href="?page=folders">';
             if (!$this->get('hide_folder_icons')) {
-                $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$folder).'" alt="" width="16" height="16" /> ';
+                $res .= '<i class="bi bi-folder-fill fs-5 me-2"></i>';
             }
             $res .= $this->trans('Folders').'</a></li>';
             if ($this->format == 'HTML5') {
diff --git a/modules/profiles/modules.php b/modules/profiles/modules.php
index f323ae72e8..119c25b7b0 100644
--- a/modules/profiles/modules.php
+++ b/modules/profiles/modules.php
@@ -190,7 +190,7 @@ class Hm_Output_profile_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_profiles"><a class="unread_link" href="?page=profiles">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$person).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-person-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Profiles').'</a></li>';
         if ($this->format == 'HTML5') {
diff --git a/modules/sievefilters/modules.php b/modules/sievefilters/modules.php
index 058a9d612a..5379df81df 100644
--- a/modules/sievefilters/modules.php
+++ b/modules/sievefilters/modules.php
@@ -1173,12 +1173,12 @@ protected function output() {
         }
         $res = '<li class="menu_filters"><a class="unread_link" href="?page=sieve_filters">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$book).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-journal-bookmark-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Filters').'</a></li>';
         $res .= '<li class="menu_block_list"><a class="unread_link" href="?page=block_list">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$circle_x).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-x-circle-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Block List').'</a></li>';
         if ($this->format == 'HTML5') {
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 37cd8359ac..fc721bda6d 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -875,7 +875,7 @@ class Hm_Output_sent_folder_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_sent"><a class="unread_link" href="?page=message_list&amp;list_path=sent">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$sent).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-send-check-fill fs-5 me-2"></i>';
         }
         $res .= $this->trans('Sent').'</a></li>';
         $this->concat('formatted_folder_list', $res);
@@ -887,7 +887,7 @@ protected function output() {
  */
 class Hm_Output_compose_form_start extends Hm_Output_Module {
     protected function output() {
-        return'<div class="compose_page p-0"><div class="content_title">'.$this->trans('Compose').'</div>'.
+        return'<div class="compose_page p-0"><div class="content_title px-3">'.$this->trans('Compose').'</div>'.
             '<div class="container"><div class="row justify-content-md-center">'.
             '<div class="col col-lg-8">'.
             '<form class="compose_form p-4" method="post" action="?page=compose">';
@@ -1367,7 +1367,7 @@ class Hm_Output_compose_page_link extends Hm_Output_Module {
     protected function output() {
         $res = '<li class="menu_compose"><a class="unread_link" href="?page=compose">';
         if (!$this->get('hide_folder_icons')) {
-            $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$doc).'" alt="" width="16" height="16" /> ';
+            $res .= '<i class="bi bi-file-earmark-text fs-5 me-2"></i>';
         }
         $res .= $this->trans('Compose').'</a></li>';