diff --git a/demo/Ursa.Demo/Views/TitleBarRightContent.axaml b/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
index 1ba3aaa..4fa97bf 100644
--- a/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
+++ b/demo/Ursa.Demo/Views/TitleBarRightContent.axaml
@@ -8,6 +8,8 @@
     <StackPanel Orientation="Horizontal">
         <Button
             Padding="8"
+            Width="32"
+            Height="32"
             Theme="{DynamicResource BorderlessButton}"
             Click="OpenRepository">
             <PathIcon
diff --git a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
index 204768a..e012588 100644
--- a/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/ThemeSelector.axaml
@@ -2,14 +2,15 @@
                     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
-                    Padding="8"
-                    FontWeight="Regular"
                     Name="{x:Static u:ThemeToggleButton.PART_ThemeButton}"
-                    HorizontalAlignment="Center"
-                    Theme="{DynamicResource BorderlessButton}">
+                    Theme="{DynamicResource BorderlessButton}"
+                    Padding="{TemplateBinding Padding}">
                     <PathIcon
                         Name="PART_Icon"
                         Theme="{StaticResource InnerPathIcon}"