diff --git a/src/Ursa.Themes.Semi/Controls/Notification.axaml b/src/Ursa.Themes.Semi/Controls/Notification.axaml
index 5493734..c5943fc 100644
--- a/src/Ursa.Themes.Semi/Controls/Notification.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Notification.axaml
@@ -3,9 +3,9 @@
                     xmlns:u="https://irihi.tech/ursa">
     <Design.PreviewWith>
         <ThemeVariantScope RequestedThemeVariant="Dark">
-            <StackPanel Orientation="Vertical">
-                <u:NotificationCard ShowClose="False" />
-                <u:NotificationCard />
+            <ReversibleStackPanel Orientation="Vertical">
+                <u:NotificationCard ShowIcon="False" ShowClose="False" />
+                <u:NotificationCard ShowIcon="False" />
                 <u:NotificationCard NotificationType="Information">
                     Hello, Ursa!
                 </u:NotificationCard>
@@ -15,10 +15,10 @@
                 <u:NotificationCard NotificationType="Warning">
                     <u:Notification Content="Hello, Ursa!" />
                 </u:NotificationCard>
-                <u:NotificationCard NotificationType="Error">
+                <u:NotificationCard NotificationType="Error" Classes="Light">
                     <u:Notification Title="Welcome" Content="Hello, Ursa!" />
                 </u:NotificationCard>
-            </StackPanel>
+            </ReversibleStackPanel>
         </ThemeVariantScope>
     </Design.PreviewWith>
 
@@ -26,41 +26,35 @@
         <Setter Property="Margin" Value="0" />
         <Setter Property="Template">
             <ControlTemplate>
-                <ReversibleStackPanel Name="PART_Items" />
+                <ReversibleStackPanel Name="PART_Items" ReverseOrder="True" />
             </ControlTemplate>
         </Setter>
         <Style Selector="^:topleft /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
             <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="HorizontalAlignment" Value="Left" />
         </Style>
 
         <Style Selector="^:topright /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
             <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="HorizontalAlignment" Value="Right" />
         </Style>
 
         <Style Selector="^:topcenter /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
             <Setter Property="VerticalAlignment" Value="Top" />
             <Setter Property="HorizontalAlignment" Value="Center" />
         </Style>
 
         <Style Selector="^:bottomleft /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
             <Setter Property="VerticalAlignment" Value="Bottom" />
             <Setter Property="HorizontalAlignment" Value="Left" />
         </Style>
 
         <Style Selector="^:bottomright /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
             <Setter Property="VerticalAlignment" Value="Bottom" />
             <Setter Property="HorizontalAlignment" Value="Right" />
         </Style>
 
         <Style Selector="^:bottomcenter /template/ ReversibleStackPanel#PART_Items">
-            <Setter Property="ReverseOrder" Value="True" />
             <Setter Property="VerticalAlignment" Value="Bottom" />
             <Setter Property="HorizontalAlignment" Value="Center" />
         </Style>
diff --git a/src/Ursa.Themes.Semi/Controls/Toast.axaml b/src/Ursa.Themes.Semi/Controls/Toast.axaml
index 82a69df..1522196 100644
--- a/src/Ursa.Themes.Semi/Controls/Toast.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Toast.axaml
@@ -3,15 +3,16 @@
                     xmlns:u="https://irihi.tech/ursa">
     <Design.PreviewWith>
         <ThemeVariantScope RequestedThemeVariant="Dark">
-            <StackPanel Orientation="Horizontal">
-                <u:ToastCard ShowClose="False" />
+            <ReversibleStackPanel>
+                <u:ToastCard ShowIcon="False" ShowClose="False" />
+                <u:ToastCard />
                 <u:ToastCard>
                     Hello, Ursa!
                 </u:ToastCard>
-                <u:ToastCard NotificationType="Success" ShowClose="False">
+                <u:ToastCard NotificationType="Success" Classes="Light">
                     <u:Toast Content="Hello, Ursa!" />
                 </u:ToastCard>
-            </StackPanel>
+            </ReversibleStackPanel>
         </ThemeVariantScope>
     </Design.PreviewWith>
 
@@ -30,6 +31,7 @@
 
     <ControlTheme x:Key="{x:Type u:ToastCard}" TargetType="u:ToastCard">
         <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="BorderThickness" Value="{DynamicResource NotificationCardBorderThickness}" />
         <Setter Property="Background" Value="{DynamicResource NotificationCardBackground}" />
         <Setter Property="CornerRadius" Value="{DynamicResource NotificationCardCornerRadius}" />
@@ -49,10 +51,9 @@
                             VerticalAlignment="Top"
                             BoxShadow="{DynamicResource NotificationCardBoxShadows}"
                             CornerRadius="{TemplateBinding CornerRadius}">
-                            <Grid ColumnDefinitions="Auto,*,Auto">
+                            <DockPanel>
                                 <PathIcon
                                     x:Name="ToastIcon"
-                                    Grid.Column="0"
                                     Width="{DynamicResource NotificationCardIconWidth}"
                                     Height="{DynamicResource NotificationCardIconHeight}"
                                     Margin="{DynamicResource ToastCardIconMargin}"
@@ -61,7 +62,6 @@
                                     Data="{DynamicResource NotificationCardInformationIconPathData}" />
                                 <ContentControl
                                     x:Name="PART_Content"
-                                    Grid.Column="1"
                                     Margin="{DynamicResource ToastCardContentMargin}"
                                     VerticalContentAlignment="Center"
                                     MaxWidth="{DynamicResource ToastCardContentMaxWidth}"
@@ -85,12 +85,11 @@
                                 </ContentControl>
                                 <Button
                                     x:Name="PART_CloseButton"
-                                    Grid.Column="2"
                                     Theme="{StaticResource ToastCloseButton}"
                                     VerticalAlignment="Top"
                                     IsVisible="{TemplateBinding ShowClose}"
                                     u:MessageCard.CloseOnClick="True" />
-                            </Grid>
+                            </DockPanel>
                         </Border>
                     </Border>
                 </LayoutTransformControl>