diff --git a/samples/ControlCatalog/Pages/ToolTipPage.xaml b/samples/ControlCatalog/Pages/ToolTipPage.xaml
index 5cf7fee4d1..aa7d60bd11 100644
--- a/samples/ControlCatalog/Pages/ToolTipPage.xaml
+++ b/samples/ControlCatalog/Pages/ToolTipPage.xaml
@@ -10,7 +10,7 @@
               HorizontalAlignment="Center">
             <Border Grid.Column="0"
                     Grid.Row="1"
-                    Background="{StyleResource ThemeAccentBrush}"
+                    Background="{DynamicResource ThemeAccentBrush}"
                     Margin="5"
                     Padding="50"
                     ToolTip.Tip="This is a ToolTip">
@@ -24,7 +24,7 @@
             <Border Name="Border"
                     Grid.Column="1"
                     Grid.Row="1"
-                    Background="{StyleResource ThemeAccentBrush}"
+                    Background="{DynamicResource ThemeAccentBrush}"
                     Margin="5"
                     Padding="50"
                     ToolTip.Placement="Bottom">
diff --git a/src/Avalonia.Themes.Default/RepeatButton.xaml b/src/Avalonia.Themes.Default/RepeatButton.xaml
index 557e2d3b03..1caaa266de 100644
--- a/src/Avalonia.Themes.Default/RepeatButton.xaml
+++ b/src/Avalonia.Themes.Default/RepeatButton.xaml
@@ -1,13 +1,13 @@
 <Styles xmlns="https://github.com/avaloniaui">
     <Style Selector="RepeatButton">
         <Setter Property="Background"
-                Value="{StyleResource ThemeControlMidBrush}" />
+                Value="{DynamicResource ThemeControlMidBrush}" />
         <Setter Property="BorderBrush"
-                Value="{StyleResource ThemeBorderLightBrush}" />
+                Value="{DynamicResource ThemeBorderLightBrush}" />
         <Setter Property="BorderThickness"
-                Value="{StyleResource ThemeBorderThickness}" />
+                Value="{DynamicResource ThemeBorderThickness}" />
         <Setter Property="Foreground"
-                Value="{StyleResource ThemeForegroundBrush}" />
+                Value="{DynamicResource ThemeForegroundBrush}" />
         <Setter Property="HorizontalContentAlignment"
                 Value="Center" />
         <Setter Property="VerticalContentAlignment"
@@ -31,14 +31,14 @@
     </Style>
     <Style Selector="RepeatButton:pointerover /template/ ContentPresenter">
         <Setter Property="BorderBrush"
-                Value="{StyleResource ThemeBorderMidBrush}" />
+                Value="{DynamicResource ThemeBorderMidBrush}" />
     </Style>
     <Style Selector="RepeatButton:pressed  /template/ ContentPresenter">
         <Setter Property="Background"
-                Value="{StyleResource ThemeControlDarkBrush}" />
+                Value="{DynamicResource ThemeControlDarkBrush}" />
     </Style>
     <Style Selector="RepeatButton:disabled">
         <Setter Property="Opacity"
-                Value="{StyleResource ThemeDisabledOpacity}" />
+                Value="{DynamicResource ThemeDisabledOpacity}" />
     </Style>
 </Styles>
\ No newline at end of file