diff --git a/src/ElectronicPharmacy/UserControls/FOrders.Designer.cs b/src/ElectronicPharmacy/UserControls/FOrders.Designer.cs
index 4fa6a2e..23fd588 100644
--- a/src/ElectronicPharmacy/UserControls/FOrders.Designer.cs
+++ b/src/ElectronicPharmacy/UserControls/FOrders.Designer.cs
@@ -347,6 +347,7 @@
             this.btnClearGoodSearch.Name = "btnClearGoodSearch";
             this.btnClearGoodSearch.Size = new System.Drawing.Size(34, 32);
             this.btnClearGoodSearch.TabIndex = 26;
+            this.btnClearGoodSearch.Text = "×";
             this.btnClearGoodSearch.Click += new System.EventHandler(this.btnClearGoodSearch_Click);
             // 
             // btnClearOrderNumberFilter
@@ -357,6 +358,7 @@
             this.btnClearOrderNumberFilter.Name = "btnClearOrderNumberFilter";
             this.btnClearOrderNumberFilter.Size = new System.Drawing.Size(34, 32);
             this.btnClearOrderNumberFilter.TabIndex = 28;
+            this.btnClearOrderNumberFilter.Text = "×";
             this.btnClearOrderNumberFilter.Click += new System.EventHandler(this.btnClearOrderNumberFilter_Click);
             // 
             // txtOrderNumberFilter
diff --git a/src/ElectronicPharmacy/UserControls/FOrders.cs b/src/ElectronicPharmacy/UserControls/FOrders.cs
index 749d90a..e7c9090 100644
--- a/src/ElectronicPharmacy/UserControls/FOrders.cs
+++ b/src/ElectronicPharmacy/UserControls/FOrders.cs
@@ -44,6 +44,8 @@ namespace Электронная_Фармация.UserControls
             InitOrderToolbar();
             loadConsignees();
             ApplyToolbarLayout();
+            ModernButtonStyles.ApplyClear(btnClearGoodSearch);
+            ModernButtonStyles.ApplyClear(btnClearOrderNumberFilter);
             panelToolbar.Resize += (_, __) => ApplyToolbarLayout();
         }
 
@@ -136,6 +138,9 @@ namespace Электронная_Фармация.UserControls
             btnAddComment.SetBounds(x, row2Y, commentWidth, buttonHeight);
             ModernButtonStyles.FitToText(btnAddComment, buttonHeight);
 
+            ModernButtonStyles.ApplyClear(btnClearGoodSearch);
+            ModernButtonStyles.ApplyClear(btnClearOrderNumberFilter);
+
             btnClearSuppliers.Visible = false;
 
             panelToolbar.Height = row2Y + buttonHeight + pad + 8;
diff --git a/src/ElectronicPharmacy/UserControls/UCInvoices.cs b/src/ElectronicPharmacy/UserControls/UCInvoices.cs
index c63a887..9a2b20c 100644
--- a/src/ElectronicPharmacy/UserControls/UCInvoices.cs
+++ b/src/ElectronicPharmacy/UserControls/UCInvoices.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Elfisa.UI.Controls;
 using Электронная_Фармация.Classes;
 using System.Data.SQLite;
 
@@ -165,6 +166,7 @@ order by i.InvoiceDate asc
             button1.Visible = true;
             button1.Text = "Обновить с сервера";
             button1.Width = 180;
+            ModernButtonStyles.ApplyAuto(button1);
             button1.Click += async (_, __) => await SyncFromServerAsync();
 
             loadConsignees();
diff --git a/src/ElectronicPharmacy/UserControls/UCRefusals.cs b/src/ElectronicPharmacy/UserControls/UCRefusals.cs
index 9e3d139..21a1cfb 100644
--- a/src/ElectronicPharmacy/UserControls/UCRefusals.cs
+++ b/src/ElectronicPharmacy/UserControls/UCRefusals.cs
@@ -91,6 +91,8 @@ namespace Электронная_Фармация.UserControls
         private void OnLoad(object sender, EventArgs e)
         {
             UiThemeHelper.ApplyToControlTree(this);
+            _header.Tag = "toolbar";
+            ModernButtonStyles.ApplyAuto(_btnRefresh);
             Reload();
         }
 
diff --git a/src/Elfisa.UI/Controls/ModernButton.cs b/src/Elfisa.UI/Controls/ModernButton.cs
index b49fd01..dd312a4 100644
--- a/src/Elfisa.UI/Controls/ModernButton.cs
+++ b/src/Elfisa.UI/Controls/ModernButton.cs
@@ -388,7 +388,7 @@ namespace Elfisa.UI.Controls
                 }
             }
 
-            if (_focused && Enabled && ShowFocusCues && !_headerNavMode && !_topNavMode && !_sidebarMode)
+            if (_focused && Enabled && ShowFocusCues && !_headerNavMode && !_topNavMode && !_sidebarMode && !_compactIconMode)
             {
                 var focusBounds = Rectangle.Inflate(flatBounds, -2, -2);
                 using (var pen = new Pen(theme.InputBorderFocus, 2f))
diff --git a/src/Elfisa.UI/Controls/ModernButtonStyles.cs b/src/Elfisa.UI/Controls/ModernButtonStyles.cs
index e5373e1..712e569 100644
--- a/src/Elfisa.UI/Controls/ModernButtonStyles.cs
+++ b/src/Elfisa.UI/Controls/ModernButtonStyles.cs
@@ -122,9 +122,20 @@ namespace Elfisa.UI.Controls
 
         private static bool IsClearButton(ModernButton button, string text)
         {
-            return text == "×"
-                || text.Equals("X", StringComparison.OrdinalIgnoreCase)
-                || (button.Width <= 40 && button.Height <= 40 && text.Length <= 2);
+            if (text == "×" || text.Equals("X", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            var name = button.Name ?? string.Empty;
+            if (name.IndexOf("Clear", StringComparison.OrdinalIgnoreCase) >= 0
+                && button.Width <= 48
+                && button.Height <= 44)
+            {
+                return true;
+            }
+
+            return button.Width <= 44 && button.Height <= 44 && text.Length <= 2;
         }
 
         private static bool IsDangerAction(string text)
@@ -147,8 +158,10 @@ namespace Elfisa.UI.Controls
                 || lower.Contains("выполн")
                 || lower.Contains("коммент")
                 || lower.Contains("подтвер")
+                || lower.Contains("обнов")
                 || lower.Contains("send")
                 || lower.Contains("save")
+                || lower.Contains("refresh")
                 || lower == "ок";
         }
     }