diff --git a/src/Ursa.Themes.Semi/Controls/Drawer.axaml b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
index 3800d0f..207a3fa 100644
--- a/src/Ursa.Themes.Semi/Controls/Drawer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
@@ -2,7 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:c="clr-namespace:Ursa.Themes.Semi.Converters"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
     <ControlTheme x:Key="{x:Type u:CustomDrawerControl}" TargetType="u:CustomDrawerControl">
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -157,27 +158,16 @@
                                     Orientation="Horizontal">
                                     <Button
                                         Name="{x:Static u:DefaultDialogControl.PART_CancelButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Tertiary"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
+                                        Margin="8,0,0,0" />
                                     <Button
                                         Name="{x:Static u:DefaultDialogControl.PART_NoButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Danger"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_NO}"
-                                        Theme="{DynamicResource SolidButton}" />
+                                        Margin="8,0,0,0" />
                                     <Button
                                         Name="{x:Static u:DefaultDialogControl.PART_YesButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Primary"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_YES}"
-                                        Theme="{DynamicResource SolidButton}" />
+                                        Margin="8,0,0,0" />
                                     <Button
                                         Name="{x:Static u:DefaultDialogControl.PART_OKButton}"
-                                        Margin="8,0,0,0"
-                                        Classes="Primary"
-                                        Content="{DynamicResource STRING_MENU_DIALOG_OK}"
-                                        Theme="{DynamicResource SolidButton}" />
+                                        Margin="8,0,0,0" />
                                 </StackPanel>
                             </Grid>
                         </Border>
@@ -186,6 +176,29 @@
                 </Panel>
             </ControlTemplate>
         </Setter>
+        <Style Selector="^ /template/ Button#PART_CancelButton">
+            <Setter Property="Grid.Column" Value="0"/>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_NoButton">
+            <Setter Property="Grid.Column" Value="1"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Danger"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_YesButton">
+            <Setter Property="Grid.Column" Value="2"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Primary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
+        <Style Selector="^ /template/ Button#PART_OKButton">
+            <Setter Property="Grid.Column" Value="3"></Setter>
+            <Setter Property="helpers:ClassHelper.Classes" Value="Primary"/>
+            <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}"/>
+            <Setter Property="Theme" Value="{DynamicResource SolidButton}"/>
+        </Style>
         <Style Selector="^[Position=Right] /template/ Border#PART_Root">
             <Setter Property="Margin" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Padding, Converter={x:Static c:ThicknessTakeConverter.Left}}" />
             <Setter Property="CornerRadius" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=CornerRadius, Converter={x:Static c:CornerRadiusTakeConverter.Left}}" />