diff --git a/lib/features/connections/driver_manager_dialog.dart b/lib/features/connections/driver_manager_dialog.dart
index 40ddb41b..13c8a6e6 100644
--- a/lib/features/connections/driver_manager_dialog.dart
+++ b/lib/features/connections/driver_manager_dialog.dart
@@ -127,24 +127,11 @@ class _DriverManagerDialogContent extends material.StatelessWidget {
               ),
             ),
           ),
-          material.Container(
-            padding: const material.EdgeInsets.symmetric(
-                horizontal: 24, vertical: 16),
-            decoration: material.BoxDecoration(
-              border: material.Border(
-                top: material.BorderSide(
-                    color: theme.border.withValues(alpha: 0.3)),
-              ),
-            ),
-            child: material.Row(
-              mainAxisAlignment: material.MainAxisAlignment.end,
-              children: [
-                QueryaButton.primary(
-                  label: 'Close',
-                  onPressed: () => material.Navigator.of(context).pop(),
-                  size: QueryaControlSize.lg,
-                ),
-              ],
+          QueryaDialogActions(
+            cancel: QueryaButton.ghost(
+              label: 'Close',
+              onPressed: () => material.Navigator.of(context).pop(),
+              size: QueryaControlSize.lg,
             ),
           ),
         ],
diff --git a/lib/features/extensions/presentation/pages/extension_manager_dialog.dart b/lib/features/extensions/presentation/pages/extension_manager_dialog.dart
index e8bf9d50..5f7c788b 100644
--- a/lib/features/extensions/presentation/pages/extension_manager_dialog.dart
+++ b/lib/features/extensions/presentation/pages/extension_manager_dialog.dart
@@ -233,7 +233,7 @@ class _ExtensionManagerContentState
                       ),
                     ),
                     const material.SizedBox(width: 16),
-                    QueryaButton.primary(
+                    QueryaButton.ghost(
                       label: 'Close',
                       onPressed: () => material.Navigator.of(context).pop(),
                       size: QueryaControlSize.lg,
diff --git a/lib/features/help/about_dialog.dart b/lib/features/help/about_dialog.dart
index 275937f9..59c29445 100644
--- a/lib/features/help/about_dialog.dart
+++ b/lib/features/help/about_dialog.dart
@@ -80,27 +80,11 @@ class _AboutDialogContentState extends material.State<_AboutDialogContent> {
               ],
             ),
           ),
-          material.Container(
-            padding: const material.EdgeInsets.symmetric(
-              horizontal: 24,
-              vertical: 16,
-            ),
-            decoration: material.BoxDecoration(
-              border: material.Border(
-                top: material.BorderSide(
-                  color: theme.border.withValues(alpha: 0.3),
-                ),
-              ),
-            ),
-            child: material.Row(
-              mainAxisAlignment: material.MainAxisAlignment.end,
-              children: [
-                QueryaButton.primary(
-                  label: 'Close',
-                  onPressed: () => material.Navigator.of(context).pop(),
-                  size: QueryaControlSize.lg,
-                ),
-              ],
+          QueryaDialogActions(
+            cancel: QueryaButton.ghost(
+              label: 'Close',
+              onPressed: () => material.Navigator.of(context).pop(),
+              size: QueryaControlSize.lg,
             ),
           ),
         ],
diff --git a/lib/features/settings/preferences_dialog.dart b/lib/features/settings/preferences_dialog.dart
index e7c85a06..d04e6cc1 100644
--- a/lib/features/settings/preferences_dialog.dart
+++ b/lib/features/settings/preferences_dialog.dart
@@ -409,31 +409,14 @@ class PreferencesDialogContentState
                 ),
 
                 // Footer Actions
-                material.Container(
-                  padding: const material.EdgeInsets.symmetric(
-                    horizontal: 20,
-                    vertical: 12,
-                  ),
-                  decoration: material.BoxDecoration(
-                    border: material.Border(
-                      top: material.BorderSide(
-                        color: theme.border.withValues(alpha: 0.28),
-                      ),
-                    ),
+                QueryaDialogActions(
+                  leading: const PreferencesHint(
+                    'Changes apply immediately and persist locally.',
                   ),
-                  child: material.Row(
-                    children: [
-                      const material.Expanded(
-                        child: PreferencesHint(
-                          'Changes apply immediately and persist locally.',
-                        ),
-                      ),
-                      QueryaButton.secondary(
-                        label: 'Close',
-                        onPressed: () => material.Navigator.of(context).pop(),
-                        size: QueryaControlSize.lg,
-                      ),
-                    ],
+                  cancel: QueryaButton.ghost(
+                    label: 'Close',
+                    onPressed: () => material.Navigator.of(context).pop(),
+                    size: QueryaControlSize.lg,
                   ),
                 ),
               ],
diff --git a/lib/features/updater/update_dialog.dart b/lib/features/updater/update_dialog.dart
index 295f6325..7d912159 100644
--- a/lib/features/updater/update_dialog.dart
+++ b/lib/features/updater/update_dialog.dart
@@ -536,7 +536,7 @@ class UpdateDialogContentState extends material.State<UpdateDialogContent> {
               ),
             ],
           UpdateDialogPhase.upToDate => [
-              QueryaButton.primary(
+              QueryaButton.ghost(
                 label: 'Close',
                 onPressed: () => material.Navigator.of(context).pop(),
                 size: QueryaControlSize.lg,