diff --git a/modules/core/site.css b/modules/core/site.css
index b6fcfb2511..9cd5d27de7 100644
--- a/modules/core/site.css
+++ b/modules/core/site.css
@@ -385,7 +385,6 @@ button {
 .inner_list li {
   padding: 4px;
   padding-left: 10px;
-  color: #555;
   padding-bottom: 0px;
   margin: 2px;
   white-space: nowrap;
diff --git a/modules/core/site.js b/modules/core/site.js
index 2afebee472..4f81a9bfc9 100644
--- a/modules/core/site.js
+++ b/modules/core/site.js
@@ -718,10 +718,12 @@ function Message_List() {
         if ($('input[type=checkbox]', $('.message_table')).filter(function() {return this.checked; }).length > 0) {
             $('.msg_controls').addClass('d-flex');
             $('.msg_controls').removeClass('d-none');
+            $('.mailbox_list_title').addClass('hide');
         }
         else {
             $('.msg_controls').removeClass('d-flex');
             $('.msg_controls').addClass('d-none');
+            $('.mailbox_list_title').removeClass('hide');
         }
     };
 
diff --git a/modules/imap/site.js b/modules/imap/site.js
index aa8c583ee6..5017f139dc 100644
--- a/modules/imap/site.js
+++ b/modules/imap/site.js
@@ -1257,7 +1257,7 @@ $(function() {
 
     if ($('.imap_move').length > 0) {
         check_select_for_imap();
-        $('.toggle_link').on("click", function() {  $('.mailbox_list_title').toggleClass('hide'); setTimeout(search_selected_for_imap, 100); });
+        $('.toggle_link').on("click", function() { setTimeout(search_selected_for_imap, 100); });
         Hm_Ajax.add_callback_hook('ajax_imap_folder_display', check_select_for_imap);
         Hm_Message_List.callbacks.push(check_select_for_imap);
         $('.imap_move').on("click", function() { return false; });
diff --git a/modules/imap_folders/site.css b/modules/imap_folders/site.css
index b3ca5c9738..d763a2eaf5 100644
--- a/modules/imap_folders/site.css
+++ b/modules/imap_folders/site.css
@@ -9,7 +9,7 @@
 /* .sp_description { padding-bottom: 20px; } */
 #draft_val, #sent_val, #trash_val, #junk_val { padding-left: 20px; }
 .manage_folder_icon { vertical-align: -3px; opacity: .3 }
-.manage_folder_link { color: #999 !important; }
+.manage_folder_link { opacity: 0.6; }
 
 .folder_subscription_btn { position: absolute; right: 20px; top: 20px; }
 .folders_subscription { padding-left: 10px; width: 100%; display: inline-block; }
diff --git a/modules/sievefilters/functions.php b/modules/sievefilters/functions.php
index f723d53b5f..049b79ad01 100644
--- a/modules/sievefilters/functions.php
+++ b/modules/sievefilters/functions.php
@@ -64,11 +64,11 @@ function get_classic_filter_modal_content()
                             <h5 class="mt-0">Conditions</h5>
                         </div>
                         <div class="flex-grow-1 text-end">
-                            <button class="sieve_add_condition_modal_button btn btn-sm border bg-white">Add Condition</button>
+                            <button class="sieve_add_condition_modal_button btn btn-sm border btn-primary">Add Condition</button>
                         </div>
                     </div>
-                    <div class="d-block mt-3">
-                        <table class="sieve_list_conditions_modal">
+                    <div class="d-block mt-3 table-responsive">
+                        <table class="sieve_list_conditions_modal table">
                         </table>
                     </div>
                 </div>
@@ -79,11 +79,11 @@ function get_classic_filter_modal_content()
                             <h5 class="mt-0">Actions</h5>
                         </div>
                         <div class="flex-grow-1 text-end">
-                            <button class="filter_modal_add_action_btn btn btn-sm  border bg-white">Add Action</button>
+                            <button class="filter_modal_add_action_btn btn btn-sm border btn-primary">Add Action</button>
                         </div>
                     </div>
-                    <div class="d-block mt-3">
-                        <table class="filter_actions_modal_table">
+                    <div class="d-block mt-3 table-responsive">
+                        <table class="filter_actions_modal_table table">
                         </table>
                     </div>
                 </div>
diff --git a/modules/sievefilters/site.css b/modules/sievefilters/site.css
index 1f55e13bc9..124080c0b1 100644
--- a/modules/sievefilters/site.css
+++ b/modules/sievefilters/site.css
@@ -267,7 +267,6 @@
     margin: 0;
     padding: 0;
     width: 100%;
-    table-layout: fixed;
 }
 
 
@@ -277,7 +276,6 @@ table.sieve_list_conditions_modal caption {
 }
 
 table.sieve_list_conditions_modal tr {
-    background-color: #f8f8f8;
     border: 1px solid #ddd;
     padding: .35em;
 }
@@ -332,7 +330,6 @@ table.filter_actions_modal_table caption {
 }
 
 table.filter_actions_modal_table tr {
-    background-color: #f8f8f8;
     border: 1px solid #ddd;
     padding: .35em;
 }
diff --git a/modules/sievefilters/site.js b/modules/sievefilters/site.js
index 376a053f47..ef09e04bad 100644
--- a/modules/sievefilters/site.js
+++ b/modules/sievefilters/site.js
@@ -645,7 +645,7 @@ $(function () {
                 '                                    <input type="text" name="sieve_selected_option_value[]" class="form-control form-control-sm" />' +
                 '                                </td>' +
                 '                                <td class="col-sm-1 text-end align-middle">' +
-                '                                    <a href="#" class="delete_condition_modal_button">Delete</a>' +
+                '                                    <a href="#" class="delete_condition_modal_button btn btn-sm btn-secondary">Delete</a>' +
                 '                                </td>' +
                 '                            </tr>'
             );
@@ -686,7 +686,7 @@ $(function () {
                 '    <input type="hidden" name="sieve_selected_action_value[]" value="">' +
                 '    </input>' +
                 '    <td class="col-sm-1 text-end align-middle">' +
-                '           <a href="#" class="delete_action_modal_button">Delete</a>' +
+                '           <a href="#" class="delete_action_modal_button btn btn-sm btn-secondary">Delete</a>' +
                 '    </td>' +
                 '</tr>'
             );