diff --git a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
index 76e44e4daf..464a12770e 100644
--- a/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
+++ b/src/Avalonia.Controls.DataGrid/Themes/Simple.xaml
@@ -202,7 +202,7 @@
 
       <Style Selector="^ /template/ Rectangle#BackgroundRectangle">
         <Setter Property="IsVisible" Value="False" />
-        <Setter Property="Fill" Value="{DynamicResource HighlightBrush}" />
+        <Setter Property="Fill" Value="{DynamicResource HighlightBrush2}" />
       </Style>
 
       <Style Selector="^:pointerover /template/ Rectangle#BackgroundRectangle">
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
index f62d8a0b79..fabd05077a 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/EventsPageView.xaml
@@ -28,7 +28,7 @@
     </Style>
 
     <Style Selector="ListBoxItem.handled" >
-      <Setter Property="Background" Value="#d9ffdc" />
+      <Setter Property="Background" Value="#34c940" />
       <Setter Property="Foreground" Value="Black" />
     </Style>
   </UserControl.Styles>
@@ -129,7 +129,7 @@
 
       </DockPanel>
 
-      <StackPanel Orientation="Horizontal" Grid.Row="3" Spacing="2" Margin="0,2">
+      <StackPanel Orientation="Horizontal" Grid.Row="3" Spacing="2" Margin="2">
         <Button Content="Clear" Command="{Binding Clear}" />
       </StackPanel>
 
diff --git a/src/Avalonia.Themes.Simple/Accents/Base.xaml b/src/Avalonia.Themes.Simple/Accents/Base.xaml
index 0c1354e475..29c0711577 100644
--- a/src/Avalonia.Themes.Simple/Accents/Base.xaml
+++ b/src/Avalonia.Themes.Simple/Accents/Base.xaml
@@ -17,6 +17,7 @@
       <Color x:Key="ThemeControlHighlightHighColor">#FF808080</Color>
       <Color x:Key="ThemeForegroundColor">#FF000000</Color>
       <Color x:Key="HighlightColor">#FF086F9E</Color>
+      <Color x:Key="HighlightColor2">#FF096085</Color>
 
       <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{StaticResource ThemeBackgroundColor}" />
       <SolidColorBrush x:Key="ThemeBorderLowBrush" Color="{StaticResource ThemeBorderLowColor}" />
@@ -33,6 +34,8 @@
       <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{StaticResource ThemeForegroundColor}" />
 
       <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" />
+      <SolidColorBrush x:Key="HighlightBrush2" Color="{StaticResource HighlightColor2}" />
+
       <SolidColorBrush x:Key="RefreshVisualizerForeground" Color="Black" />
       <SolidColorBrush x:Key="RefreshVisualizerBackground" Color="Transparent" />
     </ResourceDictionary>
@@ -51,6 +54,7 @@
       <Color x:Key="ThemeControlHighlightHighColor">#FF505050</Color>
       <Color x:Key="ThemeForegroundColor">#FFDEDEDE</Color>
       <Color x:Key="HighlightColor">#FF119EDA</Color>
+      <Color x:Key="HighlightColor2">#FF096085</Color>
 
       <SolidColorBrush x:Key="ThemeBackgroundBrush" Color="{StaticResource ThemeBackgroundColor}" />
       <SolidColorBrush x:Key="ThemeBorderLowBrush" Color="{StaticResource ThemeBorderLowColor}" />
@@ -66,6 +70,7 @@
       <SolidColorBrush x:Key="ThemeControlHighlightHighBrush" Color="{StaticResource ThemeControlHighlightHighColor}" />
       <SolidColorBrush x:Key="ThemeForegroundBrush" Color="{StaticResource ThemeForegroundColor}" />
       <SolidColorBrush x:Key="HighlightBrush" Color="{StaticResource HighlightColor}" />
+      <SolidColorBrush x:Key="HighlightBrush2" Color="{StaticResource HighlightColor2}" />
 
       <SolidColorBrush x:Key="RefreshVisualizerForeground" Color="White" />
       <SolidColorBrush x:Key="RefreshVisualizerBackground" Color="Transparent" />
diff --git a/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml b/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
index 1f4e48e4a8..8b751187d6 100644
--- a/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/ComboBox.xaml
@@ -3,6 +3,7 @@
   <ControlTheme x:Key="{x:Type ComboBox}"
                 TargetType="ComboBox">
     <Setter Property="Background" Value="Transparent" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
     <Setter Property="HorizontalContentAlignment" Value="Stretch" />
diff --git a/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml b/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml
index da8ec03cd4..ef8c6625bd 100644
--- a/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml
+++ b/src/Avalonia.Themes.Simple/Controls/DataValidationErrors.xaml
@@ -30,7 +30,6 @@
                 Background="Transparent">
           <Canvas.Styles>
             <Style Selector="ToolTip">
-              <Setter Property="Background" Value="{DynamicResource ErrorLowBrush}" />
               <Setter Property="BorderBrush" Value="{DynamicResource ErrorBrush}" />
             </Style>
           </Canvas.Styles>