diff --git a/composer.lock b/composer.lock
index aed126068f..9c204ba806 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9f54029a1093949265d1994e83c8b3c4",
+    "content-hash": "f0317cf08c00727723e842c7c83a2187",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
@@ -1606,16 +1606,16 @@
         },
         {
             "name": "twbs/bootstrap-icons",
-            "version": "v1.11.1",
+            "version": "v1.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twbs/icons.git",
-                "reference": "8d7bc695fb407627378cb184976b348e6a128d59"
+                "reference": "108565f11f099f177b31929e3eafc2c8d497fcd1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twbs/icons/zipball/8d7bc695fb407627378cb184976b348e6a128d59",
-                "reference": "8d7bc695fb407627378cb184976b348e6a128d59",
+                "url": "https://api.github.com/repos/twbs/icons/zipball/108565f11f099f177b31929e3eafc2c8d497fcd1",
+                "reference": "108565f11f099f177b31929e3eafc2c8d497fcd1",
                 "shasum": ""
             },
             "type": "library",
@@ -1639,9 +1639,9 @@
             ],
             "support": {
                 "issues": "https://github.com/twbs/icons/issues",
-                "source": "https://github.com/twbs/icons/tree/v1.11.1"
+                "source": "https://github.com/twbs/icons/tree/v1.11.2"
             },
-            "time": "2023-09-17T14:09:28+00:00"
+            "time": "2023-11-21T20:06:00+00:00"
         },
         {
             "name": "webklex/composer-info",
@@ -2203,23 +2203,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.29",
+            "version": "9.2.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
+                "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089",
+                "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -2269,7 +2269,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30"
             },
             "funding": [
                 {
@@ -2277,7 +2277,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-19T04:57:46+00:00"
+            "time": "2023-12-22T06:47:57+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2866,20 +2866,20 @@
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -2911,7 +2911,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -2919,7 +2919,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
             "name": "sebastian/diff",
@@ -3193,20 +3193,20 @@
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -3238,7 +3238,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -3246,7 +3246,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
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/hm-calendar.php b/modules/calendar/hm-calendar.php
index ec273263fc..9d51681bdd 100644
--- a/modules/calendar/hm-calendar.php
+++ b/modules/calendar/hm-calendar.php
@@ -69,7 +69,7 @@ private function output_event($day) {
                 $res .= '<div class="cal_event text-secondary">'.
                     $this->output_event_details($event).
                     $this->output_mod->html_safe(date('H:i', $event['ts'])).
-                    ' <a class="cal_title">'.$this->output_mod->html_safe($event['title']).
+                    ' <a class="cal_title cursor-pointer">'.$this->output_mod->html_safe($event['title']).
                     '</a></div>';
             }
             return $res;
diff --git a/modules/calendar/modules.php b/modules/calendar/modules.php
index 2b07e924ae..7d7f2d659e 100644
--- a/modules/calendar/modules.php
+++ b/modules/calendar/modules.php
@@ -119,7 +119,7 @@ public function process() {
 class Hm_Output_vcalendar_add_output extends Hm_Output_Module {
     protected function output() {
         if ($this->get('imap_calendar_struct')) {
-            $link = '<a class="add_vcal" href="">Add to calendar</a>';
+            $link = '<a class="add_vcal float-end mt-2 pe-4" href="">Add to calendar</a>';
             $this->concat('msg_headers', $link);
         }
     }
@@ -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') {
@@ -156,7 +156,7 @@ protected function output() {
         );
         if ($this->get('cal_action') == 'add') {
             $res = '<div class="calendar p-0">
-                        <div class="content_title">'.$this->trans('Add an Event').'</div>
+                        <div class="content_title px-3">'.$this->trans('Add an Event').'</div>
                         <div class="px-4 mt-5">
                             <form method="post">
                                 <input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />
@@ -231,8 +231,8 @@ protected function output() {
             $events = $cal_events->in_date_range($bounds[0], $bounds[1]);
             $out = new Hm_Cal_Output($this, $events);
             $out = $out->output($data, $date, $view);
-            return '<div class="calendar p-0"><div class="content_title d-flex justify-content-between">'.$this->trans('Calendar').
-                '<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm me-4">'.
+            return '<div class="calendar p-0"><div class="content_title d-flex justify-content-between px-3">'.$this->trans('Calendar').
+                '<a href="?page=calendar&amp;action=add" title="'.$this->trans('Add Event').'" class="btn btn-light btn-sm">'.
                 '<i class="bi bi-plus-circle me-2"></i> '.$this->trans('Add Event').'</a></div>'.
                 $out.'</div>';
         }
diff --git a/modules/calendar/site.css b/modules/calendar/site.css
index d9d595c176..ddf9820da3 100644
--- a/modules/calendar/site.css
+++ b/modules/calendar/site.css
@@ -1,22 +1,6 @@
-/* .calendar { width: 100%; } */
-/* .event_form { margin-left: 40px; } */
-/* .calendar_week th, .calendar_month th { font-weight: normal; padding-top: 10px; border-bottom: solid 1px #eee; padding-bottom: 10px; border-right: solid 1px #eee; } */
 .mobile .calendar_month th { max-width: 30px; overflow: hidden; }
 .calendar_month td { width: 14%; height: 120px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
-/* .calendar_week, .calendar_month { padding-bottom: 50px; width: 100%; } */
-/* .calendar_week .today, .calendar_month .today { background-color: #f5f5f5; } */
 .calendar_week .offmonth, .calendar_month .offmonth { color: #ccc; }
-/* .month_label { font-size: 120%; padding: 20px; margin-left: 10px; color: #999; } */
 .calendar_week td { width: 14%; height: 600px; text-align: left; padding: 10px; border-bottom: solid 1px #eee; vertical-align: top; border-right: solid 1px #eee; }
-.calendar .event_form { margin-top: 20px; width: 20%; }
-.calendar .event_form td { padding-top: 5px; }
-/* .cal_label { text-align: left; padding-right: 20px; } */
-/* .event_submit { padding-top: 15px !important; } */
-/* .cal_event { position: relative; margin-top: 5px; color: #666; } */
 .event_details { cursor: pointer; z-index: 100; display: none; position: absolute; width: 300px; border: solid 1px #ddd; background-color: #fff; padding: 10px; }
 .event_details td { padding: 5px; border: none;  height: auto; }
-.cal_title { cursor: pointer; }
-/* .event_title { border-bottom: solid 1px #eee; font-size: 120%; margin-bottom: 10px; } */
-/* .event_detail { padding: 10px; padding-bottom: 15px; } */
-/* .event_repeat { font-size: 90%; font-style: italic; text-align: right; } */
-.add_vcal { padding-right: 35px; float: right; margin-top: 10px; }
diff --git a/modules/carddav_contacts/modules.php b/modules/carddav_contacts/modules.php
index 9cb232cf60..f79d059b17 100644
--- a/modules/carddav_contacts/modules.php
+++ b/modules/carddav_contacts/modules.php
@@ -313,7 +313,7 @@ protected function output() {
             if (array_key_exists('phone_number', $current)) {
                 $phone = $current['phone_number'];
             }
-            $form_class = 'contact_update_form';
+            $form_class = 'contact_update_form mt-3';
             $title = sprintf($this->trans('Update Carddav - %s'), $this->html_safe($current['source']));
             $button = '<input type="hidden" name="contact_id" value="'.$this->html_safe($current['id']).'" />'.
                 '<input class="edit_contact_submit" type="submit" name="edit_contact" value="'.$this->trans('Update').'" />';
diff --git a/modules/contacts/modules.php b/modules/contacts/modules.php
index ab0d6db1ae..30f98cb3d1 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') {
@@ -106,7 +106,7 @@ protected function output() {
  */
 class Hm_Output_contacts_content_start extends Hm_Output_Module {
     protected function output() {
-        return '<div class="contacts_content"><div class="content_title">'.$this->trans('Contacts').'</div>';
+        return '<div class="contacts_content px-0"><div class="content_title px-3">'.$this->trans('Contacts').'</div>';
     }
 }
 
@@ -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>';
+                    '" class="send_to_contact cursor-pointer" title="'.$this->trans('Send To').'">'.
+                    '<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">';
@@ -247,7 +244,7 @@ protected function output() {
  */
 if (!hm_exists('build_contact_detail')) {
 function build_contact_detail($output_mod, $contact, $id) {
-    $res = '<div class="contact_detail" /><table><thead></thead><tbody>';
+    $res = '<div class="contact_detail m-3" /><table class="w-auto"><thead></thead><tbody>';
     $all_fields = false;
     $contacts = $contact->export();
     ksort($contacts);
diff --git a/modules/contacts/site.css b/modules/contacts/site.css
index a8aedbea25..beb241826b 100644
--- a/modules/contacts/site.css
+++ b/modules/contacts/site.css
@@ -1,13 +1,3 @@
-/* .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; }
@@ -15,15 +5,7 @@
 .contact_pages { text-align: center; border-bottom: none !important; }
 .no_contact_sources { text-align: center; color: #999; font-size: 110%; margin-top: 60px; }
 .add_contact { margin-bottom: 30px; margin-top: 10px; color: #666; margin-right: 25px; float: left; clear: left; margin-left: 25px; width: 300px; }
-/* .add_contact input, .add_contact select { margin-bottom: 10px; padding: 5px; margin-right: 5px; } */
-/* .add_contact .server_title { cursor: pointer; } */
 .contact_form { margin-top: 10px; display: none; }
-.add_contact .menu_caret { opacity: .7; }
-.contact_update_form { margin-top: 10px; }
-.contact_update_form, .contact_form { white-space: nowrap; }
-.contact_detail { margin: 20px; margin-bottom: 30px; }
-.contact_detail_row table { width: auto; }
-.contact_detail td { border: none; }
 .contact_detail_row { border: none; display: none;}
 .display_name, .email_address, .phone_number { font-weight: bold; }
 .show_contact { margin-right: 15px; }
diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php
index 0338452c52..f1cda526ec 100644
--- a/modules/core/message_list_functions.php
+++ b/modules/core/message_list_functions.php
@@ -386,7 +386,7 @@ function message_since_dropdown($since, $name, $output_mod) {
         '-1 year' => 'Last year',
         '-5 years' => 'Last 5 years'
     );
-    $res = '<select name="'.$name.'" id="'.$name.'" class="message_list_since">';
+    $res = '<select name="'.$name.'" id="'.$name.'" class="message_list_since form-select form-select-sm w-auto">';
     $reset = '';
     foreach ($times as $val => $label) {
         $res .= '<option';
@@ -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 75d3b1395d..b700beab1f 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -612,9 +612,9 @@ class Hm_Output_start_settings_form extends Hm_Output_Module {
      * Opens a div, form and table
      */
     protected function output() {
-        return '<div class="user_settings"><div class="content_title">'.$this->trans('Site Settings').'</div>'.
+        return '<div class="user_settings px-0"><div class="content_title px-3">'.$this->trans('Site Settings').'</div>'.
             '<form method="POST"><input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
-            '<table class="settings_table"><colgroup>'.
+            '<div class="px-3"><table class="settings_table table table-borderless"><colgroup>'.
             '<col class="label_col"><col class="setting_col"></colgroup>';
     }
 }
@@ -641,7 +641,7 @@ protected function output() {
         }
         $res = '<tr class="general_setting"><td><label for="start_page">'.
             $this->trans('First page after login').'</label></td>'.
-            '<td><select id="start_page" name="start_page">';
+            '<td><select class="form-select form-select-sm w-auto" id="start_page" name="start_page">';
         foreach ($options as $label => $val) {
             $res .= '<option ';
             if ($start_page == $val) {
@@ -678,7 +678,7 @@ protected function output() {
         }
         $res = '<tr class="general_setting"><td><label for="default_sort_order">'.
             $this->trans('Default message sort order').'</label></td>'.
-            '<td><select id="default_sort_order" name="default_sort_order">';
+            '<td><select class="form-select form-select-sm w-auto" id="default_sort_order" name="default_sort_order">';
         foreach ($options as $val => $label) {
             $res .= '<option ';
             if ($default_sort_order == $val) {
@@ -715,7 +715,7 @@ protected function output() {
         }
         $res = '<tr class="general_setting"><td><label for="list_style">'.
             $this->trans('Message list style').'</label></td>'.
-            '<td><select id="list_style" name="list_style">';
+            '<td><select class="form-select form-select-sm w-auto" id="list_style" name="list_style">';
         foreach ($options as $val => $label) {
             $res .= '<option ';
             if ($list_style == $val) {
@@ -745,8 +745,8 @@ protected function output() {
             $checked = '';
             $reset = '';
         }
-        return '<tr class="general_setting"><td><label for="mailto_handler">'.$this->trans('Allow handling of mailto links').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' value="1" id="mailto_handler" name="mailto_handler" />'.$reset.'</td></tr>';
+        return '<tr class="general_setting"><td><label class="form-check-label" for="mailto_handler">'.$this->trans('Allow handling of mailto links').'</label></td>'.
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="mailto_handler" name="mailto_handler" />'.$reset.'</td></tr>';
     }
 }
 
@@ -764,8 +764,8 @@ protected function output() {
             $checked = '';
             $reset = '';
         }
-        return '<tr class="general_setting"><td><label for="no_folder_icons">'.$this->trans('Hide folder list icons').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' value="1" id="no_folder_icons" name="no_folder_icons" />'.$reset.'</td></tr>';
+        return '<tr class="general_setting"><td><label class="form-check-label" for="no_folder_icons">'.$this->trans('Hide folder list icons').'</label></td>'.
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="no_folder_icons" name="no_folder_icons" />'.$reset.'</td></tr>';
     }
 }
 
@@ -783,8 +783,8 @@ protected function output() {
             $checked = '';
             $reset = '';
         }
-        return '<tr class="general_setting"><td><label for="no_password_save">'.$this->trans('Don\'t save account passwords between logins').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' value="1" id="no_password_save" name="no_password_save" />'.$reset.'</td></tr>';
+        return '<tr class="general_setting"><td><label class="form-check-label" for="no_password_save">'.$this->trans('Don\'t save account passwords between logins').'</label></td>'.
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="no_password_save" name="no_password_save" />'.$reset.'</td></tr>';
     }
 }
 
@@ -802,8 +802,8 @@ protected function output() {
             $checked = '';
             $reset = '';
         }
-        return '<tr class="general_setting"><td><label for="disable_delete_prompt">'.$this->trans('Disable prompts when deleting').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' value="1" id="disable_delete_prompt" name="disable_delete_prompt" />'.$reset.'</td></tr>';
+        return '<tr class="general_setting"><td><label class="form-check-label" for="disable_delete_prompt">'.$this->trans('Disable prompts when deleting').'</label></td>'.
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="disable_delete_prompt" name="disable_delete_prompt" />'.$reset.'</td></tr>';
     }
 }
 
@@ -816,8 +816,8 @@ class Hm_Output_start_flagged_settings extends Hm_Output_Module {
      * Settings in this section control the flagged messages view
      */
     protected function output() {
-        return '<tr><td data-target=".flagged_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$star.'" width="16" height="16" />'.
+        return '<tr><td data-target=".flagged_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-flag-fill fs-5 me-2"></i>'.
             $this->trans('Flagged').'</td></tr>';
     }
 }
@@ -834,8 +834,8 @@ protected function output() {
         if ($this->get('single_server_mode')) {
             return '';
         }
-        return '<tr><td data-target=".all_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$box.'" width="16" height="16" />'.
+        return '<tr><td data-target=".all_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-box2-fill fs-5 me-2"></i>'.
             $this->trans('Everything').'</td></tr>';
     }
 }
@@ -849,8 +849,8 @@ class Hm_Output_start_unread_settings extends Hm_Output_Module {
      * Settings in this section control the Unread view
      */
     protected function output() {
-        return '<tr><td data-target=".unread_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'.
+        return '<tr><td data-target=".unread_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-envelope-fill fs-5 me-2"></i>'.
             $this->trans('Unread').'</td></tr>';
     }
 }
@@ -871,8 +871,8 @@ protected function output() {
         if ($this->get('single_server_mode')) {
             return '';
         }
-        return '<tr><td data-target=".email_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'.
+        return '<tr><td data-target=".email_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-envelope-fill fs-5 me-2"></i>'.
             $this->trans('All Email').'</td></tr>';
     }
 }
@@ -886,8 +886,8 @@ class Hm_Output_start_general_settings extends Hm_Output_Module {
      * General settings like langauge and timezone will go here
      */
     protected function output() {
-        return '<tr><td data-target=".general_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$cog.'" width="16" height="16" />'.
+        return '<tr><td data-target=".general_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-gear-wide-connected fs-5 me-2"></i>'.
             $this->trans('General').'</td></tr>';
     }
 }
@@ -912,7 +912,7 @@ protected function output() {
         }
         return '<tr class="unread_setting"><td><label for="unread_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="unread_per_source" name="unread_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="unread_per_source" name="unread_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -956,7 +956,7 @@ protected function output() {
         }
         return '<tr class="flagged_setting"><td><label for="flagged_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="flagged_per_source" name="flagged_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="flagged_per_source" name="flagged_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1003,7 +1003,7 @@ protected function output() {
         }
         return '<tr class="email_setting"><td><label for="all_email_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="all_email_per_source" name="all_email_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="all_email_per_source" name="all_email_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1027,7 +1027,7 @@ protected function output() {
         }
         return '<tr class="all_setting"><td><label for="all_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="all_per_source" name="all_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="all_per_source" name="all_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1093,7 +1093,7 @@ protected function output() {
         $mylang = $this->get('language', '');
         $res = '<tr class="general_setting"><td><label for="language">'.
             $this->trans('Language').'</label></td>'.
-            '<td><select id="language" name="language">';
+            '<td><select id="language" class="form-select form-select-sm w-auto" name="language">';
         foreach ($translated as $id => $lang) {
             $res .= '<option ';
             if ($id == $mylang) {
@@ -1128,7 +1128,7 @@ protected function output() {
             $myzone = false;
         }
         $res = '<tr class="general_setting"><td><label for="timezone">'.
-            $this->trans('Timezone').'</label></td><td><select id="timezone" name="timezone">';
+            $this->trans('Timezone').'</label></td><td><select class="w-auto form-select form-select-sm" id="timezone" name="timezone">';
         foreach ($zones as $zone) {
             $res .= '<option ';
             if ($zone == $myzone) {
@@ -1157,9 +1157,9 @@ protected function output() {
             $checked = ' checked="checked"';
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="show_list_icons">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="show_list_icons">'.
             $this->trans('Show icons in message lists').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="show_list_icons" name="show_list_icons" value="1" />'.$reset.'</td></tr>';
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' id="show_list_icons" name="show_list_icons" value="1" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1173,10 +1173,10 @@ class Hm_Output_end_settings_form extends Hm_Output_Module {
      */
     protected function output() {
         return '<tr><td class="submit_cell" colspan="2">'.
-            '<input class="save_settings" type="submit" name="save_settings" value="'.$this->trans('Save').'" />'.
-            '</td></tr></table></form>'.
-            '<form method="POST"><input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
-            '<input class="reset_factory_button" type="submit" name="reset_factory" value="'.$this->trans('Restore Defaults').'" /></form>'.
+            '<input class="save_settings btn btn-success" type="submit" name="save_settings" value="'.$this->trans('Save').'" />'.
+            '</td></tr></table></div></form>'.
+            '<div class="px-3 d-flex justify-content-end"><form method="POST"><input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
+            '<input class="reset_factory_button btn btn-light border" type="submit" name="reset_factory" value="'.$this->trans('Restore Defaults').'" /></form></div>'.
             '</div>';
     }
 }
@@ -1255,33 +1255,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>';
 
@@ -1300,7 +1300,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>';
 
@@ -1356,7 +1356,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>';
             }
@@ -1383,7 +1383,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') {
@@ -1446,7 +1446,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);
@@ -1464,7 +1464,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);
@@ -1485,7 +1485,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);
@@ -1550,7 +1550,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">';
     }
 }
 
@@ -1686,7 +1686,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>';
@@ -1804,7 +1804,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;
     }
 }
@@ -1836,8 +1836,8 @@ class Hm_Output_start_junk_settings extends Hm_Output_Module {
      * Settings in this section control the flagged messages view
      */
     protected function output() {
-        return '<tr><td data-target=".junk_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$junk.'" width="16" height="16" />'.
+        return '<tr><td data-target=".junk_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-envelope-x-fill fs-5 me-2"></i>'.
             $this->trans('Junk').'</td></tr>';
     }
 }
@@ -1862,7 +1862,7 @@ protected function output() {
         }
         return '<tr class="junk_setting"><td><label for="junk_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="junk_per_source" name="junk_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="junk_per_source" name="junk_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1895,8 +1895,8 @@ class Hm_Output_start_trash_settings extends Hm_Output_Module {
      * Settings in this section control the flagged messages view
      */
     protected function output() {
-        return '<tr><td data-target=".trash_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$trash.'" width="16" height="16" />'.
+        return '<tr><td data-target=".trash_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-trash3-fill fs-5 me-2"></i>'.
             $this->trans('Trash').'</td></tr>';
     }
 }
@@ -1921,7 +1921,7 @@ protected function output() {
         }
         return '<tr class="trash_setting"><td><label for="trash_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="trash_per_source" name="trash_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="trash_per_source" name="trash_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1954,8 +1954,8 @@ class Hm_Output_start_drafts_settings extends Hm_Output_Module {
      * Settings in this section control the flagged messages view
      */
     protected function output() {
-        return '<tr><td data-target=".drafts_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$draft.'" width="16" height="16" />'.
+        return '<tr><td data-target=".drafts_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-pencil-square fs-5 me-2"></i>'.
             $this->trans('Drafts').'</td></tr>';
     }
 }
@@ -1980,7 +1980,7 @@ protected function output() {
         }
         return '<tr class="drafts_setting"><td><label for="drafts_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="drafts_per_source" name="drafts_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="drafts_per_source" name="drafts_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -2017,8 +2017,8 @@ protected function output() {
             $checked = ' checked="checked"';
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox" src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="warn_for_unsaved_changes">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="warn_for_unsaved_changes">'.
             $this->trans('Warn for unsaved changes').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="warn_for_unsaved_changes" name="warn_for_unsaved_changes" value="1" />'.$reset.'</td></tr>';
+            '<td><input type="checkbox" '.$checked.' id="warn_for_unsaved_changes" name="warn_for_unsaved_changes" class="form-check-input" value="1" />'.$reset.'</td></tr>';
     }
 }
diff --git a/modules/core/site.css b/modules/core/site.css
index 7ec88623df..a8d989b7e5 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; }
@@ -54,9 +52,9 @@ td { vertical-align: top; }
 .logout { cursor: pointer; background: #fff; font-size: 100%; }
 .server_content, .profile_content, .user_settings { display: table; table-layout: fixed; width: 100%; min-height: 500px; background: #fff; height: 100%; margin-right: 20px; padding-bottom: 40px; }
 .user_settings table { table-layout: fixed; width: 100%; }
-.user_settings table td { height: 34px; vertical-align: middle; padding: 5px; padding-left: 37px; padding-top: 10px; color: #666; }
+/* .user_settings table td { height: 34px; vertical-align: middle; padding: 5px; padding-left: 37px; padding-top: 10px; color: #666; } */
 /* .settings_table .save_settings { cursor: pointer; color: #666; font-size: 125%; padding: 10px !important; float: left !important; } */
-.reset_factory_button { cursor: pointer; color: #666; font-size: 100%; padding: 10px !important; float: right !important; margin-right: 20px;}
+.reset_factory_button { margin-top: -65px;}
 .disabled_link { color: #bbb; }
 /* .save_settings_password { float: left; margin-left: 0px; padding: 4px; } */
 .disabled_input, input:disabled { color: #aaa !important; background-color: #ddd; }
@@ -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; }
@@ -115,15 +110,7 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .news_cell .source {float: left; padding-right: 10px; font-size: 100% !important;}
 .news_cell .msg_date { clear: both; }
 .msg_img { max-width: 100%; }
-.wait { }
-/* .msg_controls { position: relative; display: none; padding-left: 0px; margin-right: 20px; } */
-/* .msg_controls_visible { display: inline; } */
-/* .msg_controls a { font-size: .6em; letter-spacing: 0px; color: #666; background-color: #fff; border: solid 1px #ede8e6; padding: 3px; width: auto; border-radius: 3px; vertical-align: 3px; display: inline-block !important; }
-.msg_controls a { margin-right: 3px; } */
-/* .toggle_link { padding-left: 4px !important; padding-right: 4px !important; padding-top: 4px !important;} */
 .list_settings_dialog { display: none; padding: 10px; position: absolute; top: 0px; right: 0px; width: 600px; background-color: #efefef; border: solid 1px #ede8e6; }
-/* .list_controls { position: absolute; right: 0px; padding-right: 10px; top: 0px; padding-top: 10px; background-color: #fff; } */
-/* .list_controls a { padding-right: 5px; } */
 .list_settings_dialog table { width: 1%; white-space: nowrap; }
 .list_settings_dialog table th { font-size: 90%; font-weight: normal; text-align: left; }
 .folder_toggle { font-size: 0px; float: left; margin: 15px; margin-top: 19px; display: none; }
@@ -134,22 +121,12 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .plink, .nlink { color: #666; }
 .plink:hover, .nlink:hover { color: teal !important; }
 .limit { width: 50px; margin-left: 20px; }
-/* .settings_subtitle { font-size: 115%; color: #777 !important; letter-spacing: -1px; padding-bottom: 6px !important; padding-left: 30px !important; height: 25px !important; padding-top: 15px !important; } */
-/* .server_section img, .settings_subtitle img { opacity: .4; padding-right: 10px; vertical-align: -1px; } */
-/* .settings_subtitle, .server_section { cursor: pointer; max-height: 50px; margin-top: 0px; color: #777; padding-bottom: 10px; padding-top: 15px; letter-spacing: -1px; font-size: 115%; padding-left: 30px; border-bottom: solid 1px #ede8e6; } */
-/* .list_meta { float: right; margin-right: 20px; letter-spacing: 0px; display: inline; color: #666 !important; font-size: 70% !important; margin-top: 2px; font-style: normal; margin-left: 20px; } */
-/* .list_meta b { color: #333 !important; font-weight: normal; padding-left: 5px; padding-right: 5px; vertical-align: 1px; } */
 .noscript { position: absolute; z-index: 100; right: 0px; left: 0px; top: 0px; bottom: 0px; background-color: #ede8e6; opacity: 1; padding-top: 100px; text-align: center; }
 .hide_folders { font-size: 0px; float: left; clear: none; margin-top: 10px; margin-left: 23px; }
 .hide_folders img { opacity: .4; }
 .section_caret { opacity: .15; vertical-align: 4px; padding-right: 10px; }
 .server_count { float: right; font-size: 90%; }
 .email_setting, .all_setting, .unread_setting, .flagged_setting, .general_setting, .junk_setting, .trash_setting, .drafts_setting { display: none; }
-/* .configured_server, .add_server { margin-top: 10px; color: #666; background-color: #fff; margin-bottom: 20px; padding: 10px; width: 200px; } */
-/* .message_list { min-height: 600px; background-color: #fff; height: 100%; padding-bottom: 20px; } */
-/* .configured_server { float: left; margin-left: 25px; width: 230px; } */
-/* .add_server { margin-right: 25px; float: left; clear: left; margin-left: 25px; width: 230px; } */
-/* .configured_server input, .add_server input, .add_server select { margin-bottom: 10px; padding: 5px; margin-right: 5px; } */
 .list_sources, .update_search_label_field { z-index: 100; border-left: solid 1px #ede8e6; border-bottom: solid 1px #ede8e6; position: absolute; right: 0px; top: 54px; background-color: #fafafa; font-size: 85%; padding: 30px; padding-top: 10px; display: none;}
 .list_src, .old_search_terms_label, .search_terms_label { color: #666; margin-bottom: 10px; }
 .old_search_terms_label, .search_terms_label { display: block; width: 100%; }
@@ -160,8 +137,6 @@ textarea, select, input, button { border: solid 1px #ddd; background-color: #fff
 .search_terms { padding-left: 5px; }
 .folder_list .search_terms { width: 80%; }
 .search_content { display: table; table-layout: fixed; width: 100%; min-height: 600px; background: #fff; height: 100%; margin-right: 20px; padding-bottom: 40px; }
-/* .save_perm_form, .save_details { max-width: 600px; margin-left: 30px; margin-top: 20px; padding-right: 20px; color: #666; } */
-/* .save_subtitle { font-size: 110%; padding-top: 20px; } */
 .msg_text_inner p { padding: 5px; }
 .save_reminder { clear: both; float: right; margin-right: 25px; }
 .save_reminder img { opacity: .4; }
@@ -176,7 +151,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 +202,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 +240,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 9725ee66e5..f6bd154248 100644
--- a/modules/developer/modules.php
+++ b/modules/developer/modules.php
@@ -127,7 +127,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') {
@@ -149,7 +149,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/dynamic_login/modules.php b/modules/dynamic_login/modules.php
index 9cc1aac952..abe9bb328e 100644
--- a/modules/dynamic_login/modules.php
+++ b/modules/dynamic_login/modules.php
@@ -105,7 +105,7 @@ protected function output() {
                 $res .= '<input type="hidden" value="other" name="email_provider" />';
             }
             else {
-                $res .= '<select class="dynamic_service_select" required name="email_provider"><option value="">'.
+                $res .= '<select class="dynamic_service_select form-select m-3 w-auto" required name="email_provider"><option value="">'.
                     $this->trans('E-mail Provider').'</option>'.Nux_Quick_Services::option_list(false, $this).
                     '<option value="other">'.$this->trans('Other').'</option></select><br />';
             }
diff --git a/modules/dynamic_login/site.css b/modules/dynamic_login/site.css
index d4edef074a..e69de29bb2 100644
--- a/modules/dynamic_login/site.css
+++ b/modules/dynamic_login/site.css
@@ -1 +0,0 @@
-.dynamic_service_select { margin-top: 10px; margin-bottom: 10px; width: 160px !important; margin-left: 20px; }
diff --git a/modules/feeds/modules.php b/modules/feeds/modules.php
index cf464dc9d5..387620141c 100644
--- a/modules/feeds/modules.php
+++ b/modules/feeds/modules.php
@@ -543,10 +543,10 @@ protected function output() {
                             <div class="server_count">'.$count.'</div>
                         </div>
 
-                        <div class="feeds_section px-4 pt-3">
+                        <div class="feeds_section px-4 pt-3 me-0">
                             <div class="row">
                                 <div class="col-12 col-lg-4 mb-4">
-                                    <form class="add_server" method="POST">
+                                    <form class="add_server me-0" method="POST">
                                         <input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />
 
                                         <div class="subtitle mt-4">'.$this->trans('Add an RSS/ATOM Feed').'</div>
@@ -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) {
@@ -846,8 +846,8 @@ protected function output() {
             $checked = '';
             $reset = '';
         }
-        return '<tr class="unread_setting"><td><label for="unread_exclude_feeds">'.$this->trans('Exclude unread feed items').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' value="1" id="unread_exclude_feeds" name="unread_exclude_feeds" />'.$reset.'</td></tr>';
+        return '<tr class="unread_setting"><td><label class="form-check-label" for="unread_exclude_feeds">'.$this->trans('Exclude unread feed items').'</label></td>'.
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' value="1" id="unread_exclude_feeds" name="unread_exclude_feeds" />'.$reset.'</td></tr>';
     }
 }
 
@@ -871,8 +871,8 @@ protected function output() {
  */
 class Hm_Output_start_feed_settings extends Hm_Output_Module {
     protected function output() {
-        return '<tr><td colspan="2" data-target=".feeds_setting" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$rss.'" width="16" height="16" />'.$this->trans('Feed Settings').'</td></tr>';
+        return '<tr><td colspan="2" data-target=".feeds_setting" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-rss-fill fs-5 me-2"></i>'.$this->trans('Feed Settings').'</td></tr>';
     }
 }
 
@@ -906,7 +906,7 @@ protected function output() {
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_input" src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
         return '<tr class="feeds_setting"><td><label for="feed_limit">'.$this->trans('Max feed items to display').'</label></td>'.
-            '<td><input type="text" id="feed_limit" name="feed_limit" size="2" value="'.$this->html_safe($limit).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" id="feed_limit" name="feed_limit" size="2" value="'.$this->html_safe($limit).'" />'.$reset.'</td></tr>';
     }
 }
 
diff --git a/modules/feeds/site.css b/modules/feeds/site.css
index 03362f165c..e69de29bb2 100644
--- a/modules/feeds/site.css
+++ b/modules/feeds/site.css
@@ -1,6 +0,0 @@
-/* .feeds_section { display: none; } */
-/* .feed_server_setup .content_title { cursor: pointer; } */
-/* .feeds_setting { display: none; } */
-/* .feeds_section .configured_server, .feeds_section .add_server { height: 140px; } */
-.feeds_section .add_server { margin-right: 0px; }
-.feeds .source a { color: #666; }
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/idle_timer/modules.php b/modules/idle_timer/modules.php
index 4520a8351b..3148ad742d 100644
--- a/modules/idle_timer/modules.php
+++ b/modules/idle_timer/modules.php
@@ -101,7 +101,7 @@ protected function output() {
             $idle_time = 1;
         }
         $res = '<tr class="general_setting"><td><label for="idle_time">'.$this->trans('Allowed idle time until logout').'</label></td>'.
-            '<td><select id="idle_time" name="idle_time">';
+            '<td><select class="form-select form-select-sm w-auto" id="idle_time" name="idle_time">';
         foreach ($options as $val => $label) {
             $res .= '<option ';
             if ($idle_time == $val) {
diff --git a/modules/imap/functions.php b/modules/imap/functions.php
index d73eac2340..03d858723b 100644
--- a/modules/imap/functions.php
+++ b/modules/imap/functions.php
@@ -121,7 +121,7 @@ function format_imap_folder_section($folders, $id, $output_mod) {
             $results .= '<a href="#" class="imap_folder_link expand_link" data-target="imap_'.intval($id).'_'.$output_mod->html_safe($folder_name).'">+</a>';
         }
         else {
-            $results .= ' <img class="folder_icon" src="'.Hm_Image_Sources::$folder.'" alt="" width="16" height="16" />';
+            $results .= '<i class="bi bi-folder2-open"></i> ';
         }
         if (!$folder['noselect']) {
             if (strlen($output_mod->html_safe($folder['basename']))>15) {
diff --git a/modules/imap/output_modules.php b/modules/imap/output_modules.php
index 47b5efa08b..e4db65d970 100644
--- a/modules/imap/output_modules.php
+++ b/modules/imap/output_modules.php
@@ -529,9 +529,10 @@ protected function output() {
         if ($this->get('sieve_filters_enabled')) {
             $sieve_extra = '<tr class="sieve_config" style="display: none;"><td><div class="subtitle">'.$this->trans('Sieve Configuration').'</div></td></tr>'.
                 '<tr class="sieve_config" style="display: none;"><td colspan="2"><label class="screen_reader" for="new_imap_port">'.$this->trans('Sieve Host').'</label>'.
-                '<input type="text" id="sieve_config_host" name="sieve_config_host" class="txt_fld" placeholder="'.$this->trans('localhost:4190').'"></td></tr>';
-            $sieve_extra2 = '<tr><td colspan="2"><input type="checkbox" id="enable_sieve_filter" name="enable_sieve_filter" class="" value="0">'.
-                '<label for="enable_sieve_filter">'.$this->trans('Enable Sieve Filters').'</label></td></tr>';
+                '<input class="form-control" type="text" id="sieve_config_host" name="sieve_config_host" class="txt_fld" placeholder="'.$this->trans('localhost:4190').'"></td></tr>';
+            
+                $sieve_extra2 = '<tr><td colspan="2"><div class="form-check mb-3 mt-2"><input type="checkbox" id="enable_sieve_filter" name="enable_sieve_filter" class="form-check-input" value="0">'.
+                '<label for="enable_sieve_filter" class="form-check-label"> '.$this->trans('Enable Sieve Filters').'</label></div></td></tr>';
         }
 
         return '<div class="imap_server_setup"><div data-target=".imap_section" class="server_section border-bottom cursor-pointer px-1 py-2 mt-4">'.
@@ -540,7 +541,7 @@ protected function output() {
             '<div class="server_count">'.$count.'</div></div>
             <div class="imap_section px-4 pt-3">
                 <div class="row">
-                    <div class="col-12 col-lg-4">
+                    <div class="col-12 col-lg-4 mb-4">
                         <form class="add_server" method="POST">'.
                             '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
                             '<div class="subtitle">'.$this->trans('Add an IMAP Server').'</div>'.
@@ -563,7 +564,7 @@ protected function output() {
                             $sieve_extra.
 
                             // Checkbox for Hide From Combined Pages
-                            '<div class="form-check mb-3">'.
+                            '<div class="form-check mb-3 mt-2">'.
                             '<input type="checkbox" id="new_imap_hidden" name="new_imap_hidden" class="form-check-input" value="1">'.
                             '<label for="new_imap_hidden" class="form-check-label">'.$this->trans('Hide From Combined Pages').'</label></div>'.
 
@@ -837,7 +838,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>';
             }
@@ -996,8 +997,8 @@ class Hm_Output_start_sent_settings extends Hm_Output_Module {
      * Settings in this section control the Sent E-mail view.
      */
     protected function output() {
-        return '<tr><td data-target=".sent_setting" colspan="2" class="settings_subtitle">'.
-            '<img alt="" src="'.Hm_Image_Sources::$env_closed.'" width="16" height="16" />'.
+        return '<tr><td data-target=".sent_setting" colspan="2" class="settings_subtitle cursor-pointer border-bottom p-2 text-secondary">'.
+            '<i class="bi bi-envelope-fill fs-5 me-2"></i>'.
             $this->trans('Sent').'</td></tr>';
     }
 }
@@ -1056,9 +1057,9 @@ protected function output() {
         if (array_key_exists('unread_on_open', $settings) && $settings['unread_on_open']) {
             $checked = ' checked="checked"';
         }
-        return '<tr class="general_setting"><td><label for="unread_on_open">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="unread_on_open">'.
             $this->trans('Don\'t flag a message as read on open').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="unread_on_open" name="unread_on_open" value="1" /></td></tr>';
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' id="unread_on_open" name="unread_on_open" value="1" /></td></tr>';
     }
 }
 
@@ -1076,9 +1077,9 @@ protected function output() {
         } else {
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="simple_msg_parts">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="simple_msg_parts">'.
             $this->trans('Show simple message part structure when reading a message').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="simple_msg_parts" name="simple_msg_parts" value="1" />'.$reset.'</td></tr>';
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' id="simple_msg_parts" name="simple_msg_parts" value="1" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1096,9 +1097,9 @@ protected function output() {
         } else {
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox" src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        $res = '<tr class="general_setting"><td><label for="pagination_links">'.
+        $res = '<tr class="general_setting"><td><label class="form-check-label" for="pagination_links">'.
             $this->trans('Show next & previous emails when reading a message').'</label></td>'.
-            '<td><input type="checkbox"'.$checked.' id="pagination_links" name="pagination_links" value="1" />'.$reset.'</td></tr>';
+            '<td><input class="form-check-input" type="checkbox"'.$checked.' id="pagination_links" name="pagination_links" value="1" />'.$reset.'</td></tr>';
         return $res;
     }
 }
@@ -1133,7 +1134,7 @@ protected function output() {
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_input" src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
         return '<tr class="general_setting"><td><label for="imap_per_page">'.
-            $this->trans('Messages per page for IMAP folder views').'</label></td><td><input type="text" id="imap_per_page" '.
+            $this->trans('Messages per page for IMAP folder views').'</label></td><td><input class="form-control form-control-sm w-auto" type="text" id="imap_per_page" '.
             'name="imap_per_page" value="'.$this->html_safe($per_page).'" />'.$reset.'</td></tr>';
     }
 }
@@ -1154,7 +1155,7 @@ protected function output() {
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_input" default-value="'.DEFAULT_MAX_GOOGLE_CONTACTS_NUMBER.'" src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
         return '<tr class="general_setting"><td><label for="max_google_contacts_number">'.
-            $this->trans('Max google contacts number').'</label></td><td><input type="number" id="max_google_contacts_number" '.
+            $this->trans('Max google contacts number').'</label></td><td><input class="form-control form-control-sm w-auto" type="number" id="max_google_contacts_number" '.
             'name="max_google_contacts_number" value="'.$this->html_safe($max_google_contacts_number).'" />'.$reset.'</td></tr>';
     }
 }
@@ -1172,9 +1173,9 @@ protected function output() {
             $checked = ' checked="checked"';
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="msg_part_icons">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="msg_part_icons">'.
             $this->trans('Show message part icons when reading a message').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="msg_part_icons" name="msg_part_icons" value="1" />'.$reset.'</td></tr>';
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' id="msg_part_icons" name="msg_part_icons" value="1" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1191,9 +1192,9 @@ protected function output() {
             $checked = ' checked="checked"';
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="text_only">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="text_only">'.
             $this->trans('Prefer text over HTML when reading messages').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="text_only" name="text_only" value="1" />'.$reset.'</td></tr>';
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' id="text_only" name="text_only" value="1" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1214,7 +1215,7 @@ protected function output() {
         }
         return '<tr class="sent_setting"><td><label for="sent_per_source">'.
             $this->trans('Max messages per source').'</label></td>'.
-            '<td><input type="text" size="2" id="sent_per_source" name="sent_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
+            '<td><input class="form-control form-control-sm w-auto" type="text" size="2" id="sent_per_source" name="sent_per_source" value="'.$this->html_safe($sources).'" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1231,9 +1232,9 @@ protected function output() {
             $checked = ' checked="checked"';
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="original_folder">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="original_folder">'.
             $this->trans('Archive to the original folder').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="original_folder" name="original_folder" value="1" />'.$reset.'</td></tr>';
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' id="original_folder" name="original_folder" value="1" />'.$reset.'</td></tr>';
     }
 }
 
@@ -1249,9 +1250,9 @@ protected function output() {
             $checked = ' checked="checked"';
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="review_sent_email">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="review_sent_email">'.
             $this->trans('Review sent message').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.' id="review_sent_email" name="review_sent_email" value="1" />'.$reset.'</td></tr>';
+            '<td><input class="form-check-input" type="checkbox" '.$checked.' id="review_sent_email" name="review_sent_email" value="1" />'.$reset.'</td></tr>';
     }
 }
 
diff --git a/modules/imap/site.css b/modules/imap/site.css
index 03acaebc9d..c22d2cdbc6 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; }
@@ -98,8 +97,7 @@
 .cypht-dropdown a { padding: 8px; padding-left: 15px !important; padding-right: 15px !important; white-space: nowrap; font-size: 1rem; display: block !important; margin-right: 0; border: 0; cursor: pointer; }
 .cypht-dropdown a:hover { background-color: #eee; }
 #block_sender_form { padding: 15px; display: block; }
-#block_sender_form label, #block_sender_form select, #block_sender_form textarea, #block_sender_form button { display: block; margin: 3px 0; width: 100%; }
-#block_sender_form button { color: #fff; background-color: brown; cursor: pointer; }
+#block_sender_form label, #block_sender_form select, #block_sender_form textarea { display: block; margin: 3px 0; width: 100%; }
 #block_sender_form label { text-transform: capitalize; }
 
 .snooze_date_picker, .snooze_helper { color: #333; text-transform: capitalize; }
diff --git a/modules/imap_folders/modules.php b/modules/imap_folders/modules.php
index b4047613e8..7abdc726b3 100644
--- a/modules/imap_folders/modules.php
+++ b/modules/imap_folders/modules.php
@@ -708,7 +708,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/inline_message/modules.php b/modules/inline_message/modules.php
index 02cd95cb22..38a303c6fe 100644
--- a/modules/inline_message/modules.php
+++ b/modules/inline_message/modules.php
@@ -66,11 +66,11 @@ protected function output() {
         if (array_key_exists('inline_message', $settings)) {
             $inline = $settings['inline_message'];
         }
-        $res = '<tr class="general_setting"><td>'.$this->trans('Show messages inline').'</td><td><input value="1" type="checkbox" name="inline_message"';
+        $res = '<tr class="general_setting"><td><label class="form-check-label" for="inline_message">'.$this->trans('Show messages inline').'</label></td><td><input value="1" type="checkbox" class="form-check-input" name="inline_message" id="inline_message"';
         $reset = '';
         if ($inline) {
             $res .= ' checked="checked"';
-            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
+            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise fs-6 cursor-pointer refresh_list reset_default_value_checkbox"></i></span>';
         }
         $res .= '>'.$reset.'</td></tr>';
         return $res;
@@ -88,7 +88,7 @@ protected function output() {
         if (array_key_exists('inline_message_style', $settings)) {
             $selected = $settings['inline_message_style'];
         }
-        $res = '<tr class="general_setting"><td>'.$this->trans('Inline Message Style').'</td><td><select name="inline_message_style">';
+        $res = '<tr class="general_setting"><td>'.$this->trans('Inline Message Style').'</td><td><select class="form-select form-select-sm w-auto" name="inline_message_style">';
         $res .= '<option ';
         if ($selected == 'right') {
             $res .= 'selected="selected" ';
diff --git a/modules/keyboard_shortcuts/modules.php b/modules/keyboard_shortcuts/modules.php
index a0a43c1c3e..70cc401775 100644
--- a/modules/keyboard_shortcuts/modules.php
+++ b/modules/keyboard_shortcuts/modules.php
@@ -99,15 +99,15 @@ protected function output() {
         $settings = $this->get('user_settings');
         if (array_key_exists('enable_keyboard_shortcuts', $settings) && $settings['enable_keyboard_shortcuts']) {
             $checked = ' checked="checked"';
-            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
+            $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><i class="bi bi-arrow-counterclockwise fs-6 cursor-pointer refresh_list reset_default_value_checkbox"></i></span>';
         }
         else {
             $checked = '';
             $reset='';
         }
-        return '<tr class="general_setting"><td><label for="enable_keyboard_shortcuts">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="enable_keyboard_shortcuts">'.
             $this->trans('Enable keyboard shortcuts').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.
+            '<td><input class="form-check-input" type="checkbox" '.$checked.
             ' value="1" id="enable_keyboard_shortcuts" name="enable_keyboard_shortcuts" />'.$reset.'</td></tr>';
     }
 }
@@ -117,7 +117,7 @@ protected function output() {
  */
 class Hm_Output_start_shortcuts_page extends Hm_Output_Module {
     protected function output() {
-        return '<div class="shortcut_content"><div class="content_title">'.$this->trans('Shortcuts').'</div>';
+        return '<div class="shortcut_content px-0"><div class="content_title px-3">'.$this->trans('Shortcuts').'</div>';
     }
 }
 
@@ -132,15 +132,15 @@ protected function output() {
         }
         $codes = keycodes();
         $meta = array('none', 'shift', 'control', 'alt', 'meta');
-        $res = '<div class="settings_subtitle">'.$this->trans('Edit Shortcut').'</div>';
-        $res .= '<div class="edit_shortcut_form"><form method="POST" action="?page=shortcuts&edit_id='.$this->html_safe($details['id']).'">';
+        $res = '<div class="settings_subtitle p-3">'.$this->trans('Edit Shortcut').'</div>';
+        $res .= '<div class="edit_shortcut_form px-5"><form method="POST" action="?page=shortcuts&edit_id='.$this->html_safe($details['id']).'">';
         $res .= '<input type="hidden" name="shortcut_id" value="'.$this->html_safe($details['id']).'" />';
         $res .= '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />';
         $res .= '<table>';
         $res .= '<tr><th colspan="2">'.$this->trans(ucfirst($details['group'])).' : '.
             $this->trans($details['label']).'</th></tr>';
         $res .= '<tr><td>'.$this->trans('Modifier Key(s)').'</td>';
-        $res .= '<td><select required multiple size="5" name="shortcut_meta[]">';
+        $res .= '<td><select class="form-select form-select-sm" required multiple size="5" name="shortcut_meta[]">';
         foreach ($meta as $v) {
             $res .= '<option ';
             if (in_array($v, $details['control_chars'], true)) {
@@ -153,7 +153,7 @@ protected function output() {
         }
         $res .= '</select></td></tr>';
         $res .= '<tr><td>'.$this->trans('Character').'</td>';
-        $res .= '<td><select required " name="shortcut_key">';
+        $res .= '<td><select class="form-select form-select-sm" required " name="shortcut_key">';
         foreach ($codes as $name => $val) {
             $res .= '<option ';
             if ($val == $details['char']) {
@@ -162,9 +162,11 @@ protected function output() {
             $res .= 'value="'.$this->html_safe($val).'">'.$this->html_safe($name).'</option>';
         }
         $res .= '</select></td></tr>';
-        $res .= '<tr><td colspan="2"><input type="submit" value="'.
-            $this->trans('Update').'" /> <input type="button" value="'.
-            $this->trans('Cancel').'" class="reset_shortcut" /></td></tr>';
+        $res .= '<tr><td colspan="2">
+                        <input type="submit" class="btn btn-success" value="'.$this->trans('Update').'" /> 
+                        <input type="button" class="btn btn-light border reset_shortcut" value="'.$this->trans('Cancel').'" />
+                </td></tr>';
+        
         $res .= '</table></form></div>';
         return $res;
     }
@@ -177,11 +179,11 @@ class Hm_Output_shortcuts_content extends Hm_Output_Module {
     protected function output() {
         $shortcuts = $this->get('keyboard_shortcut_data');
         $res = '<table class="shortcut_table">';
-        $res .= '<tr><td colspan="3" class="settings_subtitle">'.$this->trans('General').'</th></tr>';
+        $res .= '<tr><td colspan="3" class="settings_subtitle px-3">'.$this->trans('General').'</th></tr>';
         $res .= format_shortcut_section($shortcuts, 'general', $this);
-        $res .= '<tr><td colspan="3" class="settings_subtitle">'.$this->trans('Message List').'</td></tr>';
+        $res .= '<tr><td colspan="3" class="settings_subtitle px-3">'.$this->trans('Message List').'</td></tr>';
         $res .= format_shortcut_section($shortcuts, 'message_list', $this);
-        $res .= '<tr><td colspan="3" class="settings_subtitle">'.$this->trans('Message View').'</td></tr>';
+        $res .= '<tr><td colspan="3" class="settings_subtitle px-3">'.$this->trans('Message View').'</td></tr>';
         $res .= format_shortcut_section($shortcuts, 'message', $this);
         $res .= '</table>';
         $res .= '</div>';
@@ -208,7 +210,7 @@ protected function output() {
         if ($this->get('shortcuts_enabled')) {
             $res = '<li class="menu_shortcuts"><a class="unread_link" href="?page=shortcuts">';
             if (!$this->get('hide_folder_icons')) {
-                $res .= '<img class="account_icon" src="'.$this->html_safe(Hm_Image_Sources::$code).'" alt="" width="16" height="16" /> ';
+                $res .= '<i class="bi bi-code-slash fs-5 me-2"></i>';
             }
             $res .= $this->trans('Shortcuts').'</a></li>';
             if ($this->format == 'HTML5') {
@@ -234,10 +236,9 @@ function format_shortcut_section($data, $type, $output_mod) {
             }
             $char = array_search($vals['char'], $codes);
             $res .= sprintf('<tr><th class="keys">%s %s</th><th>%s</th>'.
-                '<td><a href="?page=shortcuts&edit_id=%s"><img width="16" height="16" alt="'.
-                $output_mod->trans('Update').'" class="kbd_config" src="%s" /><a></td></tr>',
+                '<td><a href="?page=shortcuts&edit_id=%s"><i class="kbd_config cursor-pointer bi bi-gear-wide-connected text-secondary fs-5"></i><a></td></tr>',
                 $output_mod->html_safe($c_keys), $output_mod->html_safe($char),
-                $output_mod->trans($vals['label']), $index, Hm_Image_Sources::$cog);
+                $output_mod->trans($vals['label']), $index);
         }
     }
     return $res;
diff --git a/modules/keyboard_shortcuts/site.css b/modules/keyboard_shortcuts/site.css
index 64178136b6..1c1a02bb89 100644
--- a/modules/keyboard_shortcuts/site.css
+++ b/modules/keyboard_shortcuts/site.css
@@ -1,10 +1,10 @@
-.shortcut_content { width: 100%; padding-bottom: 30px; }
-.shortcut_content .edit_shortcut_form { width: 1%; margin: 20px; margin-left: 40px; }
+/* .shortcut_content { width: 100%; padding-bottom: 30px; }
+.shortcut_content .edit_shortcut_form { width: 1%; margin: 20px; margin-left: 40px; } */
 .edit_shortcut_form table th, .edit_shortcut_form table td { padding-bottom: 10px; padding-right: 20px; text-align: left; font-weight: normal; white-space: nowrap; }
-.edit_shortcut_form select { overflow-y: auto; }
+/* .edit_shortcut_form select { overflow-y: auto; } */
 .edit_shortcut_form table th { font-size: 115%; padding-bottom: 20px; }
 .shortcut_table { width: 50%; }
-.kbd_config { cursor: pointer; opacity: .4; }
+/* .kbd_config { cursor: pointer; opacity: .4; } */
 .shortcut_table th { padding-left: 40px; font-weight: normal; padding-top: 6px; padding-bottom: 3px; text-align: left; }
 .shortcut_table td { padding-top: 5px; }
 .shortcut_table .settings_subtitle { cursor: auto; }
diff --git a/modules/ldap_contacts/modules.php b/modules/ldap_contacts/modules.php
index 7ca14aa7b1..837bc56a7c 100644
--- a/modules/ldap_contacts/modules.php
+++ b/modules/ldap_contacts/modules.php
@@ -457,7 +457,7 @@ protected function output() {
         $current = $this->get('current_ldap_contact');
         $current_source = false;
         if ($current) {
-            $form_class = 'contact_update_form';
+            $form_class = 'contact_update_form mt-3';
             $current_source = $current['source'];
             $title = sprintf($this->trans('Update LDAP - %s'), $this->html_safe($current_source));
         }
diff --git a/modules/local_contacts/modules.php b/modules/local_contacts/modules.php
index 00c0b1e3c0..2c9b9bdd74 100644
--- a/modules/local_contacts/modules.php
+++ b/modules/local_contacts/modules.php
@@ -150,14 +150,13 @@ protected function output() {
             if (array_key_exists('phone_number', $current)) {
                 $phone = $current['phone_number'];
             }
-            $form_class = 'contact_update_form';
+            $form_class = 'contact_update_form mt-3';
             $title = $this->trans('Update Local');
             $button = '<input type="hidden" name="contact_id" value="'.$this->html_safe($current['id']).'" />'.
                 '<input class="btn btn-success edit_contact_submit" type="submit" name="edit_contact" value="'.$this->trans('Update').'" />';
         }
-        return '<div class="add_contact"><form class="" method="POST">'.
-            '<div class="server_title mt-2 btn btn-light"><i class="bi bi-person-add me-2"></i>'.$title.
-            '<img alt="" class="menu_caret" src="'.Hm_Image_Sources::$chevron.'" width="8" height="8" /></div>'.
+        return '<div class="add_contact kokokoko"><form class="" method="POST">'.
+            '<button class="server_title mt-2 btn btn-light"><i class="bi bi-person-add me-2"></i>'.$title.'</button>'.
             '<div class="'.$form_class.'">'.
             '<input type="hidden" name="contact_source" value="local" />'.
             '<input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />'.
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 915c44718c..b960abb5a2 100644
--- a/modules/sievefilters/modules.php
+++ b/modules/sievefilters/modules.php
@@ -1191,12 +1191,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') {
@@ -1413,9 +1413,9 @@ protected function output() {
             $checked = '';
             $reset = '<span class="tooltip_restore" restore_aria_label="Restore default value"><img alt="Refresh" class="refresh_list reset_default_value_checkbox"  src="'.Hm_Image_Sources::$refresh.'" /></span>';
         }
-        return '<tr class="general_setting"><td><label for="enable_sieve_filter">'.
+        return '<tr class="general_setting"><td><label class="form-check-label" for="enable_sieve_filter">'.
             $this->trans('Enable sieve filter').'</label></td>'.
-            '<td><input type="checkbox" '.$checked.
+            '<td><input class="form-check-input" type="checkbox" '.$checked.
             ' value="1" id="enable_sieve_filter" name="enable_sieve_filter" />'.$reset.'</td></tr>';
     }
 }
@@ -1757,18 +1757,18 @@ function block_filter_dropdown($mod, $with_scope = true, $submit_id = 'block_sen
         .'<form id="block_sender_form">';
         if ($with_scope) {
             $ret .= '<div><label>'.$mod->trans('Who Is Blocked').'</label>'
-            .'<select name="scope">'
+            .'<select name="scope" class="form-select form-select-sm">'
             .'<option value="sender">'.$mod->trans('This Sender').'</option>'
             .'<option value="domain">'.$mod->trans('Whole domain').'</option></select></div>';
         }
         $ret .= '<div><label>'.$mod->trans('Action').'</label>'
-        .'<select name="block_action" id="block_action">'
+        .'<select class="form-select form-select-sm" name="block_action" id="block_action">'
         .'<option value="default">'.$mod->trans('Default action').'</option>'
         .'<option value="discard">'.$mod->trans('Discard').'</option>'
         .'<option value="blocked">'.$mod->trans('Move To Blocked Folder').'</option>'
         .'<option value="reject_default">'.$mod->trans('Reject With Default Message').'</option>'
         .'<option value="reject_with_message">'.$mod->trans('Reject With Specific Message').'</option>'
-        .'</select></div><div><button type="submit" id="'.$submit_id.'">'.$mod->trans($submit_title).'</button></div></form>'
+        .'</select></div><div><button class="btn btn-danger btn-sm mt-2" type="submit" id="'.$submit_id.'">'.$mod->trans($submit_title).'</button></div></form>'
         .'</div></div>';
         return $ret;
     }
diff --git a/modules/sievefilters/site.css b/modules/sievefilters/site.css
index 2da52e8561..3e895d5ed8 100644
--- a/modules/sievefilters/site.css
+++ b/modules/sievefilters/site.css
@@ -415,12 +415,6 @@ table.filter_actions_modal_table th {
     width: 100%;
 }
 
-#block_sender_form button {
-    color: #fff;
-    background-color: brown;
-    cursor: pointer;
-}
-
 #block_sender_form button:disabled {
     background-color: rgb(231, 121, 121);
     cursor: text;
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
index 6d6e4e30b9..d063987c51 100644
--- a/modules/smtp/modules.php
+++ b/modules/smtp/modules.php
@@ -871,7 +871,7 @@ protected function output() {
         }
         return '<tr class="general_setting"><td><label>'.
             $this->trans('Attachment Chunks').'</label></td>'.
-            '<td><small>('.$num_chunks.' Chunks) '.$size_in_kbs.' KB</small> <button id="clear_chunks_button" >Clear Chunks</button></td></tr>';
+            '<td><small>('.$num_chunks.' Chunks) '.$size_in_kbs.' KB</small> <button id="clear_chunks_button" class="btn btn-light btn-sm border">Clear Chunks</button></td></tr>';
     }
 }
 
@@ -882,7 +882,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);
@@ -894,7 +894,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">';
@@ -1203,7 +1203,7 @@ protected function output() {
                     </div>
                     <div class="smtp_section px-4 pt-3">
                         <div class="row">
-                        <div class="col-12 col-lg-4">
+                        <div class="col-12 col-lg-4 mb-4">
                             <form class="" method="POST">
                                 <input type="hidden" name="hm_page_key" value="'.$this->html_safe(Hm_Request_Key::generate()).'" />
                                 <div class="subtitle">'.$this->trans('Add an SMTP Server').'</div>
@@ -1251,7 +1251,7 @@ protected function output() {
         if (array_key_exists('smtp_compose_type', $settings)) {
             $selected = $settings['smtp_compose_type'];
         }
-        $res = '<tr class="general_setting"><td>'.$this->trans('Outbound mail format').'</td><td><select name="smtp_compose_type">';
+        $res = '<tr class="general_setting"><td>'.$this->trans('Outbound mail format').'</td><td><select class="form-select form-select-sm w-auto" name="smtp_compose_type">';
         $res .= '<option ';
         if ($selected == 0) {
             $res .= 'selected="selected" ';
@@ -1282,7 +1282,7 @@ protected function output() {
         if (array_key_exists('smtp_auto_bcc', $settings)) {
             $auto = $settings['smtp_auto_bcc'];
         }
-        $res = '<tr class="general_setting"><td>'.$this->trans('Always BCC sending address').'</td><td><input value="1" type="checkbox" name="smtp_auto_bcc"';
+        $res = '<tr class="general_setting"><td><label class="form-check-label" for="smtp_auto_bcc">'.$this->trans('Always BCC sending address').'</label></td><td><input class="form-check-input" value="1" type="checkbox" name="smtp_auto_bcc" id="smtp_auto_bcc"';
         $reset = '';
         if ($auto) {
             $res .= ' checked="checked"';
@@ -1374,7 +1374,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>';
 
diff --git a/modules/themes/modules.php b/modules/themes/modules.php
index 46b053d3c5..d67f3de127 100644
--- a/modules/themes/modules.php
+++ b/modules/themes/modules.php
@@ -80,7 +80,7 @@ protected function output() {
         $current = $this->get('theme', '');
         $res = '<tr class="general_setting"><td><label for="theme_setting">'.
             $this->trans('Theme').'</label></td>'.
-            '<td><select id="theme_setting" name="theme_setting">';
+            '<td><select class="form-select form-select-sm" id="theme_setting" name="theme_setting">';
         $reset = '';
         foreach ($this->get('themes', array()) as $name => $label) {
             $res .= '<option ';