diff --git a/demo/Ursa.Demo/Views/TitleBarRightContent.axaml b/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
index 4fa97bf..9ce261b 100644
--- a/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
+++ b/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
@@ -6,17 +6,11 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Ursa.Demo.Views.TitleBarRightContent">
     <StackPanel Orientation="Horizontal">
-        <Button
-            Padding="8"
-            Width="32"
-            Height="32"
-            Theme="{DynamicResource BorderlessButton}"
-            Click="OpenRepository">
-            <PathIcon
-                Theme="{StaticResource InnerPathIcon}"
-                Data="{StaticResource SemiIconGithubLogo}"
-                Foreground="{DynamicResource SemiColorText1}" />
-        </Button>
+        <u:IconButton
+            Theme="{StaticResource BorderlessIconButton}"
+            Classes="Tertiary"
+            Icon="{StaticResource SemiIconGithubLogo}"
+            Click="OpenRepository" />
         <u:ThemeToggleButton
             IsThreeState="True"
             Mode="Controller" />
diff --git a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
index e012588..5f8a2f7 100644
--- a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
@@ -2,32 +2,27 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:u="https://irihi.tech/ursa">
     <ControlTheme TargetType="u:ThemeToggleButton" x:Key="{x:Type u:ThemeToggleButton}">
-        <Setter Property="Padding" Value="8" />
-        <Setter Property="Width" Value="32" />
-        <Setter Property="Height" Value="32" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:ThemeToggleButton">
-                <Button
+                <u:IconButton
                     Name="{x:Static u:ThemeToggleButton.PART_ThemeButton}"
-                    Theme="{DynamicResource BorderlessButton}"
-                    Padding="{TemplateBinding Padding}">
-                    <PathIcon
-                        Name="PART_Icon"
-                        Theme="{StaticResource InnerPathIcon}"
-                        Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
-                </Button>
+                    Theme="{StaticResource BorderlessIconButton}"
+                    Classes="Tertiary"
+                    Padding="{TemplateBinding Padding}"
+                    Width="{TemplateBinding Width}"
+                    Height="{TemplateBinding Height}" />
             </ControlTemplate>
         </Setter>
-        <Style Selector="^:dark /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDarkGlyph}" />
+        <Style Selector="^:dark /template/ u|IconButton#PART_ThemeButton">
+            <Setter Property="Icon" Value="{StaticResource ThemeSelectorButtonDarkGlyph}" />
             <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_DARK}" />
         </Style>
-        <Style Selector="^:light /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonLightGlyph}" />
+        <Style Selector="^:light /template/ u|IconButton#PART_ThemeButton">
+            <Setter Property="Icon" Value="{StaticResource ThemeSelectorButtonLightGlyph}" />
             <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_LIGHT}" />
         </Style>
-        <Style Selector="^ /template/ PathIcon#PART_Icon">
-            <Setter Property="Data" Value="{DynamicResource ThemeSelectorButtonDefaultGlyph}" />
+        <Style Selector="^ /template/ u|IconButton#PART_ThemeButton">
+            <Setter Property="Icon" Value="{StaticResource ThemeSelectorButtonDefaultGlyph}" />
             <Setter Property="ToolTip.Tip" Value="{DynamicResource STRING_THEME_TOGGLE_SYSTEM}" />
         </Style>
     </ControlTheme>