diff --git a/YKanBan/Views/Dialogs/AboutDialog.axaml b/YKanBan/Views/Dialogs/AboutDialog.axaml
index 537525f..1ab291c 100644
--- a/YKanBan/Views/Dialogs/AboutDialog.axaml
+++ b/YKanBan/Views/Dialogs/AboutDialog.axaml
@@ -31,7 +31,8 @@
 
         <Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
                 Click="OnCloseClick" HorizontalAlignment="Right" MinWidth="90"
-                IsDefault="True" IsCancel="True"/>
+                IsDefault="True" IsCancel="True"
+                Theme="{DynamicResource SolidButton}" Classes="Primary"/>
 
     </Grid>
 </Window>
diff --git a/YKanBan/Views/Dialogs/CardEditorDialog.axaml b/YKanBan/Views/Dialogs/CardEditorDialog.axaml
index c59188a..761caf0 100644
--- a/YKanBan/Views/Dialogs/CardEditorDialog.axaml
+++ b/YKanBan/Views/Dialogs/CardEditorDialog.axaml
@@ -66,7 +66,8 @@
 
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
                     Spacing="8" Margin="0,16,0,0">
-            <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"/>
+            <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"
+                    Theme="{DynamicResource SolidButton}" Classes="Primary"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90"
                     IsCancel="True"/>
         </StackPanel>
diff --git a/YKanBan/Views/Dialogs/ColumnEditorDialog.axaml b/YKanBan/Views/Dialogs/ColumnEditorDialog.axaml
index 06f8d9e..332e6aa 100644
--- a/YKanBan/Views/Dialogs/ColumnEditorDialog.axaml
+++ b/YKanBan/Views/Dialogs/ColumnEditorDialog.axaml
@@ -29,7 +29,8 @@
 
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
                     Spacing="8" Margin="0,16,0,0">
-            <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"/>
+            <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"
+                    Theme="{DynamicResource SolidButton}" Classes="Primary"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90" IsCancel="True"/>
         </StackPanel>
     </Grid>
diff --git a/YKanBan/Views/Dialogs/DeleteCardConfirmDialog.axaml b/YKanBan/Views/Dialogs/DeleteCardConfirmDialog.axaml
index 94051a0..6c44e75 100644
--- a/YKanBan/Views/Dialogs/DeleteCardConfirmDialog.axaml
+++ b/YKanBan/Views/Dialogs/DeleteCardConfirmDialog.axaml
@@ -16,7 +16,7 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
-                    MinWidth="90"/>
+                    MinWidth="90" Classes="Danger"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
                     MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
diff --git a/YKanBan/Views/Dialogs/DeleteColumnConfirmDialog.axaml b/YKanBan/Views/Dialogs/DeleteColumnConfirmDialog.axaml
index 4dfe520..4489a1a 100644
--- a/YKanBan/Views/Dialogs/DeleteColumnConfirmDialog.axaml
+++ b/YKanBan/Views/Dialogs/DeleteColumnConfirmDialog.axaml
@@ -16,7 +16,7 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
-                    MinWidth="90"/>
+                    MinWidth="90" Classes="Danger"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
                     MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
diff --git a/YKanBan/Views/Dialogs/DeleteTagConfirmDialog.axaml b/YKanBan/Views/Dialogs/DeleteTagConfirmDialog.axaml
index c3cab38..b6f9748 100644
--- a/YKanBan/Views/Dialogs/DeleteTagConfirmDialog.axaml
+++ b/YKanBan/Views/Dialogs/DeleteTagConfirmDialog.axaml
@@ -16,7 +16,7 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
-                    MinWidth="90"/>
+                    MinWidth="90" Classes="Danger"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
                     MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
diff --git a/YKanBan/Views/Dialogs/DiscardEditConfirmDialog.axaml b/YKanBan/Views/Dialogs/DiscardEditConfirmDialog.axaml
index ac67feb..82a2cc1 100644
--- a/YKanBan/Views/Dialogs/DiscardEditConfirmDialog.axaml
+++ b/YKanBan/Views/Dialogs/DiscardEditConfirmDialog.axaml
@@ -16,7 +16,7 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnConfirmClick"
-                    MinWidth="90"/>
+                    MinWidth="90" Classes="Danger"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
                     MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
diff --git a/YKanBan/Views/Dialogs/ExportDoneDialog.axaml b/YKanBan/Views/Dialogs/ExportDoneDialog.axaml
index 10fd98a..9196e92 100644
--- a/YKanBan/Views/Dialogs/ExportDoneDialog.axaml
+++ b/YKanBan/Views/Dialogs/ExportDoneDialog.axaml
@@ -16,6 +16,7 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
                 Click="OnOkClick" HorizontalAlignment="Right" MinWidth="90"
-                IsDefault="True" IsCancel="True"/>
+                IsDefault="True" IsCancel="True"
+                Theme="{DynamicResource SolidButton}" Classes="Primary"/>
     </Grid>
 </Window>
diff --git a/YKanBan/Views/Dialogs/MoveCardDialog.axaml b/YKanBan/Views/Dialogs/MoveCardDialog.axaml
index 4202777..1bb9840 100644
--- a/YKanBan/Views/Dialogs/MoveCardDialog.axaml
+++ b/YKanBan/Views/Dialogs/MoveCardDialog.axaml
@@ -31,7 +31,8 @@
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
                     Spacing="8" Margin="0,16,0,0">
             <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick"
-                    MinWidth="90" IsDefault="True" IsEnabled="{Binding CanMove}"/>
+                    MinWidth="90" IsDefault="True" IsEnabled="{Binding CanMove}"
+                    Theme="{DynamicResource SolidButton}" Classes="Primary"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
                     MinWidth="90" IsCancel="True"/>
         </StackPanel>
diff --git a/YKanBan/Views/Dialogs/SearchErrorDialog.axaml b/YKanBan/Views/Dialogs/SearchErrorDialog.axaml
index 45d40f4..847e8a2 100644
--- a/YKanBan/Views/Dialogs/SearchErrorDialog.axaml
+++ b/YKanBan/Views/Dialogs/SearchErrorDialog.axaml
@@ -16,6 +16,7 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <Button Grid.Row="1" Content="{x:Static lang:Resources.Common_Ok}"
                 Click="OnOkClick" HorizontalAlignment="Right" MinWidth="90"
-                IsDefault="True" IsCancel="True"/>
+                IsDefault="True" IsCancel="True"
+                Theme="{DynamicResource SolidButton}" Classes="Primary"/>
     </Grid>
 </Window>
diff --git a/YKanBan/Views/Dialogs/SettingsDialog.axaml b/YKanBan/Views/Dialogs/SettingsDialog.axaml
index e9ce3d0..a972eaf 100644
--- a/YKanBan/Views/Dialogs/SettingsDialog.axaml
+++ b/YKanBan/Views/Dialogs/SettingsDialog.axaml
@@ -61,7 +61,7 @@
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
                     Spacing="8" Margin="0,16,0,0">
             <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90"
-                    IsDefault="True"/>
+                    IsDefault="True" Theme="{DynamicResource SolidButton}" Classes="Primary"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90"
                     IsCancel="True"/>
         </StackPanel>
diff --git a/YKanBan/Views/Dialogs/TagEditorDialog.axaml b/YKanBan/Views/Dialogs/TagEditorDialog.axaml
index ed0bc7c..529addd 100644
--- a/YKanBan/Views/Dialogs/TagEditorDialog.axaml
+++ b/YKanBan/Views/Dialogs/TagEditorDialog.axaml
@@ -32,7 +32,8 @@
 
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
                     Spacing="8" Margin="0,16,0,0">
-            <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"/>
+            <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick" MinWidth="90" IsDefault="True"
+                    Theme="{DynamicResource SolidButton}" Classes="Primary"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick" MinWidth="90" IsCancel="True"/>
         </StackPanel>
     </Grid>
diff --git a/YKanBan/Views/Dialogs/TagPickerDialog.axaml b/YKanBan/Views/Dialogs/TagPickerDialog.axaml
index 77dd3fa..edd344b 100644
--- a/YKanBan/Views/Dialogs/TagPickerDialog.axaml
+++ b/YKanBan/Views/Dialogs/TagPickerDialog.axaml
@@ -34,7 +34,8 @@
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right"
                     Spacing="8" Margin="0,16,0,0">
             <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnOkClick"
-                    MinWidth="90" IsDefault="True" IsEnabled="{Binding CanAdd}"/>
+                    MinWidth="90" IsDefault="True" IsEnabled="{Binding CanAdd}"
+                    Theme="{DynamicResource SolidButton}" Classes="Primary"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
                     MinWidth="90" IsCancel="True"/>
         </StackPanel>