diff --git a/composer.lock b/composer.lock
index 9c204ba806..71fbd74c51 100755
--- a/composer.lock
+++ b/composer.lock
@@ -1606,16 +1606,16 @@
         },
         {
             "name": "twbs/bootstrap-icons",
-            "version": "v1.11.2",
+            "version": "v1.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twbs/icons.git",
-                "reference": "108565f11f099f177b31929e3eafc2c8d497fcd1"
+                "reference": "8d88686c03c3768a2d82ba4f20c3c4e1b100fa29"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twbs/icons/zipball/108565f11f099f177b31929e3eafc2c8d497fcd1",
-                "reference": "108565f11f099f177b31929e3eafc2c8d497fcd1",
+                "url": "https://api.github.com/repos/twbs/icons/zipball/8d88686c03c3768a2d82ba4f20c3c4e1b100fa29",
+                "reference": "8d88686c03c3768a2d82ba4f20c3c4e1b100fa29",
                 "shasum": ""
             },
             "type": "library",
@@ -1639,9 +1639,9 @@
             ],
             "support": {
                 "issues": "https://github.com/twbs/icons/issues",
-                "source": "https://github.com/twbs/icons/tree/v1.11.2"
+                "source": "https://github.com/twbs/icons/tree/v1.11.3"
             },
-            "time": "2023-11-21T20:06:00+00:00"
+            "time": "2024-01-03T15:44:45+00:00"
         },
         {
             "name": "webklex/composer-info",
@@ -2036,25 +2036,27 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.18.0",
+            "version": "v5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+                "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
-                "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc",
+                "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc",
                 "shasum": ""
             },
             "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.4"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
-                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
+                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -2062,7 +2064,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.9-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -2086,9 +2088,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0"
             },
-            "time": "2023-12-10T21:03:43+00:00"
+            "time": "2024-01-07T17:17:35+00:00"
         },
         {
             "name": "phar-io/manifest",
diff --git a/modules/advanced_search/modules.php b/modules/advanced_search/modules.php
index e256253ade..84d4416a58 100644
--- a/modules/advanced_search/modules.php
+++ b/modules/advanced_search/modules.php
@@ -188,12 +188,10 @@ protected function output() {
  */
 class Hm_Output_advanced_search_content_start extends Hm_Output_Module {
     protected function output() {
-        return '<div class="search_content"><div class="content_title">'.
-            '<img width="16" height="16" src="'.Hm_Image_Sources::$plus.'" '.
-            'alt="'.$this->trans('Expand all').'" class="adv_expand_all">'.
-            '<img width="16" height="16" src="'.Hm_Image_Sources::$minus.'" '.
-            'alt="'.$this->trans('Expand all').'" class="adv_collapse_all">'.
-            $this->trans('Advanced Search').'</div>';
+        return '<div class="search_content px-0"><div class="content_title d-flex align-items-center px-3">'.
+            '<i class="bi bi-caret-down-fill adv_expand_all cursor-pointer"></i>'.
+            '<i class="bi bi-caret-up adv_collapse_all cursor-pointer"></i>'.
+            '<lable class="ms-2">'.$this->trans('Advanced Search').'</label></div>';
     }
 }
 
@@ -223,37 +221,34 @@ protected function output() {
             $this->targets().
             $this->times().
             $this->other().
-            '<div class="submit_section"><input type="button" id="adv_search" value="'.$this->trans('Search').'" />'.
-            ' <input type="button" class="adv_reset" value="'.$this->trans('Reset').'" />';
+            '<div class="submit_section px-5"><input type="button" class="btn btn-success" id="adv_search" value="'.$this->trans('Search').'" />'.
+            ' <input class="btn btn-light border" type="button" class="adv_reset" value="'.$this->trans('Reset').'" />';
     }
 
     protected function targets() {
-        return '<div data-target=".targets_section" class="settings_subtitle"><img width="16" height="16" alt="'.
-            $this->trans('targets').'" src="'.Hm_Image_Sources::$doc.'" />'.$this->trans('Targets').
+        return '<div data-target=".targets_section" class="settings_subtitle cursor-pointer px-3 py-2 "><i class="bi bi-file-earmark-fill me-2"></i>'.$this->trans('Targets').
             '<span class="target_count">'.sprintf($this->trans('targets: %d'), 0).'</span></div>'.
-            '<div class="targets_section"><table id="adv_target" class="adv_targets"><tr><th>'.
-            '<input type="radio" value="TEXT" id="adv_msg" class="target_radio" checked="checked" '.
-            'name="target_type" /><label for="adv_msg">'.$this->trans('Entire message').'</label></th>'.
-            '<th><input type="radio" class="target_radio" value="BODY" name="target_type" id="adv_body" '.
-            '/><label for="adv_body">'.$this->trans('Body').'</label></th><td></td></tr><tr><th><input type="radio" '.
-            'class="target_radio" value="header" id="adv_header_radio" name="target_type" /><label for="adv_header_radio">'.
-            $this->trans('Header').'</label></th><td>'.'<select class="adv_header_select" ><option value="FROM">'.
+            '<div class="targets_section mx-5 py-4"><div class="col-lg-6 col-12" id="adv_target"><table class="adv_targets table table-borderless"><tr><th>'.
+            '<input type="radio" value="TEXT" id="adv_msg" class="target_radio form-check-input" checked="checked" '.
+            'name="target_type" /><label class="form-check-label ms-2" for="adv_msg">'.$this->trans('Entire message').'</label></th>'.
+            '<th><input type="radio" class="target_radio form-check-input" value="BODY" name="target_type" id="adv_body" '.
+            '/><label class="form-check-label ms-2" for="adv_body">'.$this->trans('Body').'</label></th><td></td></tr><tr><th><input type="radio" '.
+            'class="target_radio form-check-input" value="header" id="adv_header_radio" name="target_type" /><label class="form-check-label ms-2" for="adv_header_radio">'.
+            $this->trans('Header').'</label></th><td>'.'<select class="adv_header_select form-select" ><option value="FROM">'.
             $this->trans('From').'</option><option value="SUBJECT">'.$this->trans('Subject').'</option><option value="TO">'.
             $this->trans('To').'</option><option value="CC">'.$this->trans('Cc').'</option></select></td></tr>'.
-            '<tr><th><input type="radio" class="target_radio" value="custom" id="adv_custom" name="target_type" />'.
-            '<label for="adv_custom">'.$this->trans('Custom Header').'</label></th><td><input class="adv_custom_header" '.
-            'type="text" /></td></tr></table><img class="new_target" width="16" height="16" alt="'.$this->trans('Add').
-            '" src="'.Hm_Image_Sources::$plus.'" /></div>';
+            '<tr><th><input type="radio" class="target_radio form-check-input" value="custom" id="adv_custom" name="target_type" />'.
+            '<label class="form-check-label ms-2" for="adv_custom">'.$this->trans('Custom Header').'</label></th><td><input class="adv_custom_header form-control" '.
+            'type="text" /></td></tr></table></div><i class="bi bi-plus-circle new_target cursor-pointer ms-2"></i></div>';
     }
 
     protected function terms() {
-        return '<div data-target=".terms_section" class="settings_subtitle"><img width="16" height="16" alt="'.
-            $this->trans('terms').'" src="'.Hm_Image_Sources::$search.'" />'.$this->trans('Terms').
+        return '<div data-target=".terms_section" class="settings_subtitle cursor-pointer px-3 py-2 mt-3">'.
+            '<i class="bi bi-search me-2"></i>'.$this->trans('Terms').
             '<span class="term_count">'.sprintf($this->trans('terms: %d'), 0).'</span></div>'.
-            '<div class="terms_section">'.
-            '<span id="adv_term_not" class="adv_term_nots"><input type="checkbox" value="not" id="adv_term_not" /> !</span>'.
-            '<input class="adv_terms" id="adv_term" type="text" /><img class="new_term" '.
-            'width="16" height="16" alt="'.$this->trans('Add').'" src="'.Hm_Image_Sources::$plus.'" /></div>';
+            '<div class="terms_section mx-5 py-4">'.
+            '<div class="d-flex align-items-center"><span id="adv_term_not" class="adv_term_nots"><input type="checkbox" class="form-check-input" value="not" id="adv_term_not" /> !</span>'.
+            '<input class="adv_terms form-control w-auto" id="adv_term" type="text" /><i class="bi bi-plus-circle new_term cursor-pointer ms-3"></i></div></div>';
     }
 
     protected function times() {
@@ -261,50 +256,45 @@ protected function times() {
         $from_date = date("Y-m-d", $from_time);
         $to_time = strtotime("+1 day", time());
         $to_date = date("Y-m-d", $to_time);
-        return '<div data-target=".time_section" class="settings_subtitle"><img width="16" height="16" alt="'.
-            $this->trans('time').'" src="'.Hm_Image_Sources::$calendar.'" />'.$this->trans('Time').
+        return '<div data-target=".time_section" class="settings_subtitle cursor-pointer px-3 py-2 "><i class="bi bi-calendar3-week-fill me-2"></i>'.$this->trans('Time').
             '<span class="time_count">'.sprintf($this->trans('time ranges: %d'), 0).'</span></div>'.
-            '<div class="time_section"><span id="adv_time" class="adv_times">'.$this->trans('From').
-            ' <input class="adv_time_fld_from" type="date" value="'.$this->html_safe($from_date).
-            '" /> '.$this->trans('To').' <input class="adv_time_fld_to" type="date" value="'.
-            $this->html_safe($to_date).'" /></span> <img class="new_time" width="16" height="16" alt="'.
-            $this->trans('Add').'" src="'.Hm_Image_Sources::$plus.'" /></div>';
+            '<div class="time_section mx-5 py-4"><span id="adv_time" class="adv_times d-flex align-items-center gap-2">'.$this->trans('From').
+            ' <input class="adv_time_fld_from form-control w-auto" type="date" value="'.$this->html_safe($from_date).
+            '" /> '.$this->trans('To').' <input class="adv_time_fld_to form-control w-auto" type="date" value="'.
+            $this->html_safe($to_date).'" /></span><i class="bi bi-plus-circle new_time cursor-pointer"></i></div>';
     }
 
     protected function sources() {
-        return '<div data-target=".source_section" class="settings_subtitle"><img width="16" height="16" alt="'.
-            $this->trans('sources').'" src="'.Hm_Image_Sources::$folder.'" />'.$this->trans('Sources').
+        return '<div data-target=".source_section" class="settings_subtitle cursor-pointer px-3 py-2 "><i class="bi bi-folder-fill me-2"></i>'.$this->trans('Sources').
             '<span class="source_count">'.sprintf($this->trans('sources: %d'), 0).'</span></div>'.
-            '<div class="source_section">'.$this->trans('IMAP').' <img class="adv_folder_select" width="16" '.
-            'height="16" alt="'.$this->trans('Add').'" src="'.Hm_Image_Sources::$plus.'" /><br /><div '.
+            '<div class="source_section mx-5 py-4">'.$this->trans('IMAP').' <i class="bi bi-plus-circle adv_folder_select cursor-pointer"></i><br /><div '.
             'class="adv_folder_list"></div><div class="adv_source_list"></div></div>';
     }
 
     protected function other() {
-        return '<div data-target=".other_section" class="settings_subtitle"><img width="16" height="16" alt="'.
-            $this->trans('other').'" src="'.Hm_Image_Sources::$cog.'" />'.$this->trans('Other').
+        return '<div data-target=".other_section" class="settings_subtitle cursor-pointer px-3 py-2 "><i class="bi bi-gear-fill me-2"></i>'.$this->trans('Other').
             '<span class="other_count">'.sprintf($this->trans('other settings: %d'), 0).'</span></div>'.
-            '<div class="other_section"><table><tr><th>'.$this->trans('Character set').'</th><td><select class="charset">'.
+            '<div class="other_section mx-5 py-4"><div class="col-lg-6 col-12"><table class="table table-borderless"><tr><th>'.$this->trans('Character set').'</th><td><select class="charset form-select w-auto">'.
             '<option value="">'.$this->trans('Default').'</option><option value="UTF-8">UTF-8</option>'.
             '<option value="ASCII">ASCII</option></select></td></tr><tr><th>'.$this->trans('Results per source').'</th>'.
-            '<td><input type="number" value="100" class="adv_source_limit" /></td></tr><tr><th>'.$this->trans('Flags').'</th><td>'.
-            '<div class="flags"><input id="adv_flag_read" class="adv_flag" value="SEEN" type="checkbox">'.
-            '<label for="adv_flag_read">'.$this->trans('Read').
-            ' </label><input id="adv_flag_unread" class="adv_flag" value="UNSEEN" type="checkbox">'.
-            '<label for="adv_flag_unread">'.$this->trans('Unread').
-            '<br /></label><input id="adv_flag_answered" class="adv_flag" value="ANSWERED" type="checkbox">'.
-            '<label for="adv_flag_answered">'.$this->trans('Answered').
-            '</label><input id="adv_flag_unanswered" class="adv_flag" value="UNANSWERED" type="checkbox">'.
-            '<label for="adv_flag_unanswered">'.$this->trans('Unanswered').
-            '<br /></label><input id="adv_flag_flagged" class="adv_flag" value="FLAGGED" type="checkbox">'.
-            '<label for="adv_flag_flagged">'.$this->trans('Flagged').
-            '</label><input id="adv_flag_unflagged" class="adv_flag" value="UNFLAGGED" type="checkbox">'.
-            '<label for="adv_flag_unflagged">'.$this->trans('Unflagged').
-            '<br /></label><input id="adv_flag_deleted" class="adv_flag" value="DELETED" type="checkbox">'.
-            '<label for="adv_flag_deleted">'.$this->trans('Deleted').
-            '</label><input id="adv_flag_undeleted" class="adv_flag" value="UNDELETED" type="checkbox">'.
-            '<label for="adv_flag_undeleted">'.$this->trans('Not deleted').
-            '</label></div></td></tr></table></div>';
+            '<td><input type="number" value="100" class="adv_source_limit form-control" /></td></tr><tr><th>'.$this->trans('Flags').'</th><td>'.
+            '<div class="flags d-flex flex-column"><div><input id="adv_flag_read" class="adv_flag form-check-input" value="SEEN" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_read">'.$this->trans('Read').
+            ' </label></div><div><input id="adv_flag_unread" class="adv_flag form-check-input" value="UNSEEN" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_unread">'.$this->trans('Unread').
+            '</label></div><div><input id="adv_flag_answered" class="adv_flag form-check-input" value="ANSWERED" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_answered">'.$this->trans('Answered').
+            '</label></div><div><input id="adv_flag_unanswered" class="adv_flag form-check-input" value="UNANSWERED" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_unanswered">'.$this->trans('Unanswered').
+            '</label></div><div><input id="adv_flag_flagged" class="adv_flag form-check-input" value="FLAGGED" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_flagged">'.$this->trans('Flagged').
+            '</label></div><div><input id="adv_flag_unflagged" class="adv_flag form-check-input" value="UNFLAGGED" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_unflagged">'.$this->trans('Unflagged').
+            '</label></div><div><input id="adv_flag_deleted" class="adv_flag form-check-input" value="DELETED" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_deleted">'.$this->trans('Deleted').
+            '</label></div><div><input id="adv_flag_undeleted" class="adv_flag form-check-input" value="UNDELETED" type="checkbox">'.
+            '<label class="form-check-label ms-2" for="adv_flag_undeleted">'.$this->trans('Not deleted').
+            '</label></div></div></td></tr></table></div></div>';
     }
 }
 
@@ -314,7 +304,7 @@ protected function other() {
  */
 class Hm_Output_advanced_search_form_end extends Hm_Output_Module {
     protected function output() {
-        return '</div><div class="content_title search_result_title"><img width="16" height="16" src="'.
+        return '</div><div class="content_title search_result_title mb-3 px-3"><img width="16" height="16" src="'.
             Hm_Image_Sources::$env_closed.'" alt="'.$this->trans('Results').
             '" class="adv_expand_all">'.$this->trans('Search Results').'</div>'.
             '<div class="adv_controls">'.message_controls($this).' '.combined_sort_dialog($this).'</div>'.
diff --git a/modules/advanced_search/site.css b/modules/advanced_search/site.css
index d5d7f1f90e..3329cbac59 100644
--- a/modules/advanced_search/site.css
+++ b/modules/advanced_search/site.css
@@ -1,19 +1,9 @@
-.targets_section, .other_section, .submit_section, .time_section, .source_section, .terms_section { padding: 20px; padding-left: 60px; margin-bottom: 10px; }
 .adv_controls { margin-left: 25px; display: none; }
-.targets_section img, .time_section img, .source_section img, .terms_section img { cursor: pointer; margin-left: 10px; vertical-align: -3px; opacity: .4; }
-.submit_section { margin-top: 20px; }
-.other_section table, .targets_section table { width: 1%; white-space: nowrap; margin-bottom: 5px; }
-.other_section th, .targets_section th { vertical-align: top; font-weight: normal; text-align: left; padding: 5px; padding-bottom: 10px; }
-.other_section .flags { line-height: 150%; }
-.andor { width: 200px; padding: 10px; text-align: center; }
-.timeandor { width: 400px; padding: 10px; text-align: center; }
 .adv_folder_list { width: 400px; }
 .adv_source_list { margin-top: 10px; line-height: 150%; }
 .adv_source_list img { margin-right: 10px; }
-.adv_collapse_all, .adv_expand_all { margin-right: 10px; opacity: .4; vertical-align: -1px; cursor: pointer; }
 .adv_expand_all { display: none; }
 #adv_search { cursor: pointer; }
-.search_result_title { margin-bottom: 20px; }
 .source_count, .time_count, .target_count, .other_count, .term_count { display: none; float: right; margin-right: 30px; }
 .imap_support_required { padding: 100px; text-align: center; font-size: 120%; color: #666; }
 .adv_reset { margin-left: 20px; cursor: pointer; }
diff --git a/modules/advanced_search/site.js b/modules/advanced_search/site.js
index 0d2fe3e80a..0591788a71 100644
--- a/modules/advanced_search/site.js
+++ b/modules/advanced_search/site.js
@@ -4,13 +4,14 @@ var add_remove_terms = function(el) {
     var close = $(globals.close_html);
     var count = $('.adv_terms').length;
     var term = $('#adv_term').clone(false);
-    var not_chk = $('<span id="adv_term_not" class="adv_term_nots"><input type="checkbox" value="not" id="adv_term_not" /> !</span>');
-    var and_or_html = '<div class="andor"><input checked="checked" type="radio" name="term_and'
-    and_or_html += '_or'+count+'" value="and">and <input type="radio" name="term_and_or'+count;
+    var not_chk = $('<span id="adv_term_not" class="adv_term_nots"><input type="checkbox" class="form-check-input" value="not" id="adv_term_not" /> !</span>');
+    var and_or_html = '<div class="andor px-4"><input class="form-check-input" checked="checked" type="radio" name="term_and'
+    and_or_html += '_or'+count+'" value="and">and <input class="form-check-input" type="radio" name="term_and_or'+count;
     and_or_html += '" value="or">or</div>';
     var and_or = $(and_or_html);
     term.attr('id', 'adv_term'+count);
     close.attr('id', 'term_adv_remove'+count);
+    close.addClass('ms-2');
     and_or.attr('id', 'term_and_or'+count);
     not_chk.attr('id', 'adv_term_not'+count);
     $(el).prev().after(and_or.prop('outerHTML')+not_chk.prop('outerHTML')+term.prop('outerHTML')+close.prop('outerHTML'));
@@ -27,14 +28,15 @@ var add_remove_terms = function(el) {
 var add_remove_times = function(el) {
     var close = $(globals.close_html);
     var count = $('.adv_times').length;
-    var time_html = '<span id="adv_time" class="adv_times">From <input class="adv_time_fld_from" ';
-    time_html += 'type="date" value=""> To <input class="adv_time_fld_to" type="date" value=""></span>';
+    var time_html = '<span id="adv_time" class="adv_times d-flex align-items-center gap-2">From <input class="adv_time_fld_from form-control w-auto" ';
+    time_html += 'type="date" value=""> To <input class="adv_time_fld_to form-control w-auto" type="date" value=""></span>';
     var timeset = $(time_html);
-    var and_or_html = '<div class="timeandor"><input type="radio" name="time_and_or'+count;
+    var and_or_html = '<div class="timeandor"><input class="form-check-input" type="radio" name="time_and_or'+count;
     and_or_html += '" checked="checked" value="or">or</div>';
     var and_or = $(and_or_html);
     timeset.attr('id', 'adv_time'+count);
     close.attr('id', 'time_adv_remove'+count);
+    close.addClass('me-2');
     and_or.attr('id', 'time_and_or'+count);
     $(el).prev().after(and_or.prop('outerHTML')+timeset.prop('outerHTML')+close.prop('outerHTML'));
     $('#time_adv_remove'+count).on("click", function() {
@@ -48,8 +50,8 @@ var add_remove_targets = function(el) {
     var close = $(globals.close_html);
     var count = $('.adv_targets').length;
     var target = $('#adv_target').clone(false);
-    var and_or_html = '<div class="andor"><input type="radio" name="target_and_or'+count;
-    and_or_html += '" value="and">and <input type="radio" name="target_and_or'+count;
+    var and_or_html = '<div class="andor"><input class="form-check-input" type="radio" name="target_and_or'+count;
+    and_or_html += '" value="and">and <input class="form-check-input" type="radio" name="target_and_or'+count;
     and_or_html += '" checked="checked" value="or">or</div>';
     var and_or = $(and_or_html);
 
@@ -57,6 +59,7 @@ var add_remove_targets = function(el) {
     $('.target_radio', target).attr('name', 'target_type'+count);
     $('.target_radio', target).removeAttr('checked');
     close.attr('id', 'target_adv_remove'+count);
+    close.addClass('ms-2');
     and_or.attr('id', 'target_and_or'+count);
     $(el).prev().after(and_or.prop('outerHTML')+target.prop('outerHTML')+close.prop('outerHTML'));
     $(el).hide();
@@ -84,7 +87,7 @@ var expand_adv_folder = function(res) {
 
 var adv_select_imap_folder = function(el) {
     var close = $(globals.close_html);
-    close.addClass('close_adv_folders');
+    close.addClass('close_adv_folders ms-2');
     var list_container = $('.adv_folder_list');
     var folders = $('.email_folders').clone(false);
     folders.find('.manage_folders_li').remove();
@@ -515,13 +518,7 @@ var adv_reset_page = function() {
 $(function() {
     if (hm_page_name() == 'advanced_search') {
 
-        globals.close_html = '<img width="16" height="16" src="data:image/svg+xml,%3Csvg%20xmlns%3D%22';
-        globals.close_html += 'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%228%22%20height%3D%228%2';
-        globals.close_html += '2%20viewBox%3D%220%200%208%208%22%3E%0A%20%20%3Cpath%20d%3D%22M4%200c-2.21%';
-        globals.close_html += '200-4%201.79-4%204s1.79%204%204%204%204-1.79%204-4-1.79-4-4-4zm-1.5%201.781';
-        globals.close_html += 'l1.5%201.5%201.5-1.5.719.719-1.5%201.5%201.5%201.5-.719.719-1.5-1.5-1.5%201';
-        globals.close_html += '.5-.719-.719%201.5-1.5-1.5-1.5.719-.719z%22%20%2F%3E%0A%3C%2Fsvg%3E" alt="R';
-        globals.close_html += 'emove">';
+        globals.close_html = '<i class="bi bi-x-circle-fill cursor-pointer"></i>';
 
         $('.settings_subtitle').on("click", function() { return Hm_Utils.toggle_page_section($(this).data('target')); });
         $('.adv_folder_select').on("click", function() { adv_select_imap_folder(this); });
diff --git a/modules/core/message_list_functions.php b/modules/core/message_list_functions.php
index f1cda526ec..cc12fad359 100644
--- a/modules/core/message_list_functions.php
+++ b/modules/core/message_list_functions.php
@@ -546,7 +546,7 @@ function search_field_selection($current, $output_mod) {
         'TO' => 'To',
         'CC' => 'Cc',
     );
-    $res = '<select id="search_fld" name="search_fld">';
+    $res = '<select class="form-select form-select-sm w-auto" id="search_fld" name="search_fld">';
     foreach ($flds as $val => $name) {
         $res .= '<option ';
         if ($current == $val) {
diff --git a/modules/core/output_modules.php b/modules/core/output_modules.php
index 0e45aa8d44..91206f2df4 100644
--- a/modules/core/output_modules.php
+++ b/modules/core/output_modules.php
@@ -41,7 +41,7 @@ class Hm_Output_search_content_start extends Hm_Output_Module {
      * Leaves two open div tags that are closed in Hm_Output_search_content_end and Hm_Output_search_form
      */
     protected function output() {
-        return '<div class="search_content"><div class="content_title">'.
+        return '<div class="search_content px-0"><div class="content_title px-3 d-flex align-items-center">'.
             message_controls($this).$this->trans('Search');
     }
 }
@@ -84,7 +84,7 @@ protected function output() {
  */
 class Hm_Output_search_form_start extends Hm_Output_Module {
     protected function output() {
-        return '<div class="search_form"><form method="get">';
+        return '<div class="search_form"><form class="d-flex align-items-center" method="get">';
     }
 }
 
@@ -98,15 +98,14 @@ protected function output() {
 
         return '<input type="hidden" name="page" value="search" />'.
             ' <label class="screen_reader" for="search_terms">'.$this->trans('Search Terms').'</label>'.
-            '<input required placeholder="'.$this->trans('Search Terms').
-            '" id="search_terms" type="search" class="search_terms" name="search_terms" value="'.$this->html_safe($terms).'" />'.
+            '<input required placeholder="'.$this->trans('Search Terms').'" id="search_terms" type="search" class="search_terms form-control form-control-sm" name="search_terms" value="'.$this->html_safe($terms).'" />'.
             ' <label class="screen_reader" for="search_fld">'.$this->trans('Search Field').'</label>'.
             search_field_selection($this->get('search_fld', DEFAULT_SEARCH_FLD), $this).
             ' <label class="screen_reader" for="search_since">'.$this->trans('Search Since').'</label>'.
             message_since_dropdown($this->get('search_since', DEFAULT_SINCE), 'search_since', $this).
             combined_sort_dialog($this).
-            ' | <input type="submit" class="search_update" value="'.$this->trans('Update').'" />'.
-            ' <input type="button" class="search_reset" value="'.$this->trans('Reset').'" />';
+            ' | <input type="submit" class="search_update btn btn-success btn-sm" value="'.$this->trans('Update').'" />'.
+            ' <input type="button" class="search_reset btn btn-light border btn-sm" value="'.$this->trans('Reset').'" />';
     }
 }
 
@@ -116,12 +115,8 @@ protected function output() {
  */
 class Hm_Output_search_form_end extends Hm_Output_Module {
     protected function output() {
-        $source_link = '<a href="#" title="'.$this->trans('Sources').
-            '" class="source_link"><img alt="Sources" class="refresh_list" src="'.
-            Hm_Image_Sources::$folder.'" width="20" height="20" /></a>';
-        $refresh_link = '<a class="refresh_link" title="'.$this->trans('Refresh').'" href="#"><img alt="'.
-            $this->trans('Refresh').'" class="refresh_list" src="'.Hm_Image_Sources::$refresh.
-            '" width="20" height="20" /></a>';
+        $source_link = '<a href="#" title="'.$this->trans('Sources').'" class="source_link"><i class="bi bi-folder-fill refresh_list"></i></a>';
+        $refresh_link = '<a class="refresh_link ms-3" title="'.$this->trans('Refresh').'" href="#"><i class="bi bi-arrow-clockwise refresh_list"></i></a>';
         return '</form></div>'.
             list_controls($refresh_link, false, $source_link).list_sources($this->get('data_sources', array()), $this).'</div>';
     }
diff --git a/modules/core/site.css b/modules/core/site.css
index b7d8b33619..5d8a089bca 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -50,7 +50,7 @@ td { vertical-align: top; }
 .logout { margin: 2px; margin-left: 5px; display: block; padding: 5px; float: right; clear: none; color: #333; text-decoration: none; border: none !important; }
 .logout:hover { background-color: #eee; }
 .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; }
+.server_content, .profile_content, .user_settings { display: table; table-layout: fixed; width: 100%; background: #fff; margin-right: 20px; }
 .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; } */
 /* .settings_table .save_settings { cursor: pointer; color: #666; font-size: 125%; padding: 10px !important; float: left !important; } */
diff --git a/modules/saved_searches/modules.php b/modules/saved_searches/modules.php
index 516569c4a9..b47b04b3d7 100644
--- a/modules/saved_searches/modules.php
+++ b/modules/saved_searches/modules.php
@@ -192,8 +192,7 @@ class Hm_Output_save_search_icon extends Hm_Output_Module {
     protected function output() {
         $name = $this->get('search_name', '');
         if (!$name) {
-            return '<a style="display: none;" href="" class="save_search" title="'.$this->trans('Save search').'"><img width="20" height="20" alt="'.
-                $this->trans('Save search').'" src="'.Hm_Image_Sources::$circle_check.'" /></a>';
+            return '<a style="display: none;" href="" class="save_search" title="'.$this->trans('Save search').'"><i class="bi bi-check-circle-fill"></i></a>';
         }
     }
 }
diff --git a/modules/saved_searches/site.css b/modules/saved_searches/site.css
index 3522cb7818..c5484df237 100644
--- a/modules/saved_searches/site.css
+++ b/modules/saved_searches/site.css
@@ -2,7 +2,7 @@
 .saved_searches_form input { margin-left: 3px; margin-right: 3px; }
 .update_search_label img { opacity: .5; position: absolute; right: 105px; top: 21px; }
 .update_saved_search_title { color: #666; font-size: 110%; padding: 5px; margin-bottom: 10px; }
-.save_search img, .delete_search img { opacity: .5; position: absolute; right: 75px; top: 22px; }
+.save_search i, .delete_search img { opacity: .5; position: absolute; right: 75px; top: 22px; }
 .update_search img { opacity: .5; position: absolute; right: 135px; top: 22px; }
 
 .mobile .save_search, .mobile .update_search_label, .mobile .delete_search, .mobile .add_search { display: none !important; }