diff --git a/Content.Client/CartridgeLoader/Cartridges/NanoTaskItemControl.xaml b/Content.Client/CartridgeLoader/Cartridges/NanoTaskItemControl.xaml
index 7d7c635de8..6a9bf7dc6a 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NanoTaskItemControl.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/NanoTaskItemControl.xaml
@@ -22,11 +22,7 @@
         </Button>
         <Button Name="DoneButton"
                 VerticalExpand="True"
-                Text="{Loc 'nano-task-ui-done'}">
-            <Button.StyleClasses>
-                <system:String>ButtonSmall</system:String>
-                <system:String>OpenLeft</system:String>
-            </Button.StyleClasses>
-        </Button>
+                Text="{Loc 'nano-task-ui-done'}"
+                StyleClasses="ButtonSmall OpenLeft" />
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml b/Content.Client/Lathe/UI/LatheMenu.xaml
index f8e58403e5..6619db1de2 100644
--- a/Content.Client/Lathe/UI/LatheMenu.xaml
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml
@@ -118,12 +118,8 @@
                             Text="✖"
                             SetSize="38 32"
                             HorizontalAlignment="Right"
-                            ToolTip="{Loc 'lathe-menu-delete-fabricating-tooltip'}">
-                            <Button.StyleClasses>
-                                <system:String>negative</system:String>
-                                <system:String>OpenLeft</system:String>
-                            </Button.StyleClasses>
-                        </Button>
+                            ToolTip="{Loc 'lathe-menu-delete-fabricating-tooltip'}"
+                            StyleClasses="negative OpenLeft" />
                     </PanelContainer>
                 </BoxContainer>
                 <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
diff --git a/Content.Client/Lathe/UI/QueuedRecipeControl.xaml b/Content.Client/Lathe/UI/QueuedRecipeControl.xaml
index 09b1883e1b..c8993db34e 100644
--- a/Content.Client/Lathe/UI/QueuedRecipeControl.xaml
+++ b/Content.Client/Lathe/UI/QueuedRecipeControl.xaml
@@ -25,11 +25,7 @@
             Name="Delete"
             Margin="0"
             Text="✖"
-            ToolTip="{Loc 'lathe-menu-delete-item-tooltip'}">
-            <Button.StyleClasses>
-                <system:String>negative</system:String>
-                <system:String>OpenLeft</system:String>
-            </Button.StyleClasses>
-        </Button>
+            ToolTip="{Loc 'lathe-menu-delete-item-tooltip'}"
+            StyleClasses="negative OpenLeft" />
     </BoxContainer>
 </Control>
diff --git a/Content.Client/MainMenu/UI/MainMenuControl.xaml b/Content.Client/MainMenu/UI/MainMenuControl.xaml
index 89c3ebd299..17a3e95449 100644
--- a/Content.Client/MainMenu/UI/MainMenuControl.xaml
+++ b/Content.Client/MainMenu/UI/MainMenuControl.xaml
@@ -60,12 +60,8 @@
                         Access="Public"
                         Text="{Loc 'main-menu-quit-button'}"
                         TextAlign="Center"
-                        StyleIdentifier="mainMenu">
-                    <Control.StyleClasses>
-                        <system:String>negative</system:String>
-                        <system:String>OpenRight</system:String>
-                    </Control.StyleClasses>
-                </Button>
+                        StyleIdentifier="mainMenu"
+                        StyleClasses="negative OpenRight" />
             </BoxContainer>
         </PanelContainer>
     </BoxContainer>
diff --git a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
index 09e207b7cc..1eb4a5fa24 100644
--- a/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
+++ b/Content.Client/MassMedia/Ui/NewsArticleCard.xaml
@@ -18,12 +18,8 @@
             <Control HorizontalExpand="True"/>
             <Label FontColorOverride="#b1b1b2" StyleClasses="LabelSmall" Name="PublishTimeLabel" Margin="6 6 6 6"/>
             <controls:ConfirmButton Name="DeleteButton" Text="{Loc news-write-ui-delete-text}"
-                    HorizontalAlignment="Right" Margin="8 6 6 6" SetHeight="19" SetWidth="52" Access="Public">
-                <Button.StyleClasses>
-                    <system:String>ButtonSmall</system:String>
-                    <system:String>negative</system:String>
-                </Button.StyleClasses>
-            </controls:ConfirmButton>
+                    HorizontalAlignment="Right" Margin="8 6 6 6" SetHeight="19" SetWidth="52" Access="Public"
+                    StyleClasses="ButtonSmall negative" />
         </BoxContainer>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/Options/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
index f47f41b9fd..c3308664e7 100644
--- a/Content.Client/Options/UI/EscapeMenu.xaml
+++ b/Content.Client/Options/UI/EscapeMenu.xaml
@@ -17,17 +17,7 @@
         <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
         <Button Access="Public" Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
         <PanelContainer StyleClasses="LowDivider" Margin="0 2.5 0 2.5" />
-        <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}">
-            <Control.StyleClasses>
-                <system:String>negative</system:String>
-                <system:String>OpenLeft</system:String>
-            </Control.StyleClasses>
-        </Button>
-        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}">
-            <Control.StyleClasses>
-                <system:String>negative</system:String>
-                <system:String>OpenRight</system:String>
-            </Control.StyleClasses>
-        </Button>
+        <Button Access="Public" Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" StyleClasses="negative OpenLeft" />
+        <Button Access="Public" Name="QuitButton" Text="{Loc 'ui-escape-quit'}" StyleClasses="negative OpenRight" />
     </BoxContainer>
 </ui1:EscapeMenu>
diff --git a/RobustToolbox b/RobustToolbox
index 81e82b01d6..fc284f2ae6 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 81e82b01d6cc5957015a8c9f3baf5e573b0a5217
+Subproject commit fc284f2ae6019cc365b6ea96f63060e54d6f9cf7