diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
index 8f3c207cbb..16bc2acdd1 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Fluent/ColorView.xaml
@@ -164,7 +164,7 @@
     </Style>
   </ControlTheme>
 
-  <!-- Based on the current Fluent ToggleButton ControlTheme -->
+  <!-- Based on the Fluent ToggleButton ControlTheme -->
   <ControlTheme x:Key="ColorViewColorModelRadioButtonTheme"
                 TargetType="RadioButton">
     <Setter Property="Background" Value="{DynamicResource ToggleButtonBackground}" />
@@ -228,7 +228,7 @@
     </Style>
   </ControlTheme>
 
-  <!-- Based on the current Fluent TabItem ControlTheme -->
+  <!-- Based on the Fluent TabItem ControlTheme -->
   <ControlTheme x:Key="ColorViewTabItemTheme"
                 TargetType="TabItem">
     <Setter Property="FontSize" Value="{DynamicResource TabItemHeaderFontSize}" />
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
index 9de821367f..eddcf5e2eb 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/ColorView.xaml
@@ -164,13 +164,14 @@
     </Style>
   </ControlTheme>
 
-  <!-- Based on the current Simple ToggleButton ControlTheme -->
+  <!-- Based on the Simple ToggleButton ControlTheme -->
   <ControlTheme x:Key="ColorViewColorModelRadioButtonTheme"
                 TargetType="RadioButton">
     <Setter Property="Background" Value="{DynamicResource ThemeControlMidBrush}" />
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
     <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderLowBrush}" />
     <Setter Property="BorderThickness" Value="{DynamicResource ThemeBorderThickness}" />
-    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}" />
+    <Setter Property="CornerRadius" Value="0" />
     <Setter Property="Padding" Value="4" />
     <Setter Property="HorizontalAlignment" Value="Stretch" />
     <Setter Property="VerticalAlignment" Value="Center" />
@@ -178,20 +179,20 @@
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Padding="{TemplateBinding Padding}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+        <ContentPresenter x:Name="PART_ContentPresenter"
                           Background="{TemplateBinding Background}"
                           BorderBrush="{TemplateBinding BorderBrush}"
                           BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
+                          Padding="{TemplateBinding Padding}"
                           RecognizesAccessKey="True"
-                          TextElement.Foreground="{TemplateBinding Foreground}" />
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
     </Setter>
+
     <Style Selector="^:checked /template/ ContentPresenter#PART_ContentPresenter">
       <Setter Property="Background" Value="{DynamicResource ThemeControlHighBrush}" />
       <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}" />
@@ -204,6 +205,63 @@
     </Style>
   </ControlTheme>
 
+  <!-- Based on the Simple TabItem ControlTheme -->
+  <ControlTheme x:Key="ColorViewTabItemTheme"
+                TargetType="TabItem">
+    <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundLowBrush}" />
+    <Setter Property="Padding" Value="6,0,6,0" />
+    <Setter Property="Margin" Value="0" />
+    <Setter Property="MinHeight" Value="{DynamicResource ColorViewTabStripHeight}" />
+    <Setter Property="VerticalContentAlignment" Value="Center" />
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Border
+            Name="PART_LayoutRoot"
+            Background="{TemplateBinding Background}"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            BorderThickness="{TemplateBinding BorderThickness}"
+            CornerRadius="{TemplateBinding CornerRadius}"
+            Padding="{TemplateBinding Padding}">
+          <Panel>
+            <ContentPresenter
+                Name="PART_ContentPresenter"
+                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                Content="{TemplateBinding Header}"
+                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                FontFamily="{TemplateBinding FontFamily}"
+                FontSize="{TemplateBinding FontSize}"
+                FontWeight="{TemplateBinding FontWeight}" />
+            <Border Name="PART_SelectedPipe"
+                    Height="2"
+                    Margin="0,0,0,2"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Bottom"
+                    Background="{DynamicResource ThemeAccentColor}"
+                    CornerRadius="{DynamicResource ControlCornerRadius}"
+                    IsVisible="False"/>
+          </Panel>
+        </Border>
+      </ControlTemplate>
+    </Setter>
+
+    <Style Selector="^:selected">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush4}" />
+    </Style>
+    <Style Selector="^:selected /template/ Border#PART_SelectedPipe">
+      <Setter Property="IsVisible" Value="True" />
+    </Style>
+
+    <Style Selector="^:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource ThemeControlHighlightMidBrush}" />
+    </Style>
+
+    <Style Selector="^:selected:pointerover /template/ Border#PART_LayoutRoot">
+      <Setter Property="Background" Value="{DynamicResource ThemeAccentBrush3}" />
+    </Style>
+
+  </ControlTheme>
+
   <ControlTheme x:Key="{x:Type ColorView}"
                 TargetType="ColorView">
     <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
@@ -240,24 +298,17 @@
                       Grid.Row="0"
                       Height="338"
                       Width="350"
+                      Padding="0"
                       SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
-            <TabControl.Resources>
-              <Thickness x:Key="TabItemMargin">0,0,0,0</Thickness>
-            </TabControl.Resources>
-            <TabControl.Styles>
-              <Style Selector="TabControl">
-                <Setter Property="ItemsPanel">
-                  <Setter.Value>
-                    <ItemsPanelTemplate>
-                      <UniformGrid Columns="0"
-                                   Rows="1" />
-                    </ItemsPanelTemplate>
-                  </Setter.Value>
-                </Setter>
-              </Style>
-            </TabControl.Styles>
+            <TabControl.ItemsPanel>
+              <ItemsPanelTemplate>
+                <UniformGrid Columns="0"
+                             Rows="1" />
+              </ItemsPanelTemplate>
+            </TabControl.ItemsPanel>
             <!-- Spectrum Tab -->
-            <TabItem IsVisible="{TemplateBinding IsColorSpectrumVisible}">
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorSpectrumVisible}">
               <TabItem.Header>
                 <Border Height="{DynamicResource ColorViewTabStripHeight}">
                   <PathIcon Width="20"
@@ -321,7 +372,8 @@
               </Grid>
             </TabItem>
             <!-- Palette Tab -->
-            <TabItem IsVisible="{TemplateBinding IsColorPaletteVisible}">
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorPaletteVisible}">
               <TabItem.Header>
                 <Border Height="{DynamicResource ColorViewTabStripHeight}">
                   <PathIcon Width="20"
@@ -355,7 +407,8 @@
               </ListBox>
             </TabItem>
             <!-- Components Tab -->
-            <TabItem IsVisible="{TemplateBinding IsColorComponentsVisible}">
+            <TabItem Theme="{StaticResource ColorViewTabItemTheme}"
+                     IsVisible="{TemplateBinding IsColorComponentsVisible}">
               <TabItem.Header>
                 <Border Height="{DynamicResource ColorViewTabStripHeight}">
                   <PathIcon Width="20"
@@ -379,14 +432,14 @@
                                  Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
                                  Grid.Column="0"
                                  Content="RGB"
-                                 CornerRadius="4,0,0,4"
+                                 CornerRadius="0,0,0,0"
                                  BorderThickness="1,1,0,1"
                                  IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=TwoWay}" />
                     <RadioButton x:Name="HsvRadioButton"
                                  Theme="{StaticResource ColorViewColorModelRadioButtonTheme}"
                                  Grid.Column="1"
                                  Content="HSV"
-                                 CornerRadius="0,4,4,0"
+                                 CornerRadius="0,0,0,0"
                                  BorderThickness="0,1,1,1"
                                  IsChecked="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=TwoWay}" />
                   </Grid>
@@ -399,11 +452,11 @@
                     </Grid.ColumnDefinitions>
                     <Border Grid.Column="0"
                             Height="32"
-                            Background="{DynamicResource TextControlBackgroundDisabled}"
-                            BorderBrush="{DynamicResource TextControlBorderBrush}"
+                            Background="{DynamicResource ThemeControlMidBrush}"
+                            BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                             BorderThickness="1,1,0,1"
-                            CornerRadius="4,0,0,4">
-                      <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                            CornerRadius="0,0,0,0">
+                      <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
                                  FontWeight="SemiBold"
                                  Text="#"
                                  HorizontalAlignment="Center"
@@ -416,7 +469,7 @@
                              Height="32"
                              MaxLength="8"
                              HorizontalAlignment="Stretch"
-                             CornerRadius="0,4,4,0" />
+                             CornerRadius="0,0,0,0" />
                   </Grid>
                 </Grid>
                 <!-- Color component editing controls -->
@@ -425,19 +478,19 @@
                         Grid.Row="2"
                         Height="{Binding ElementName=Component1NumericUpDown, Path=Bounds.Height}"
                         Width="{DynamicResource ColorViewComponentLabelWidth}"
-                        Background="{DynamicResource TextControlBackgroundDisabled}"
-                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                         BorderThickness="1,1,0,1"
-                        CornerRadius="4,0,0,4"
+                        CornerRadius="0,0,0,0"
                         VerticalAlignment="Center"
                         IsVisible="{TemplateBinding IsComponentTextInputVisible}">
                   <Panel HorizontalAlignment="Center"
                          VerticalAlignment="Center">
-                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
                                FontWeight="SemiBold"
                                Text="R"
                                IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}"/>
-                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
                                FontWeight="SemiBold"
                                Text="H"
                                IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
@@ -450,7 +503,7 @@
                                ShowButtonSpinner="False"
                                Height="32"
                                Width="{DynamicResource ColorViewComponentTextInputWidth}"
-                               CornerRadius="0,4,4,0"
+                               CornerRadius="0,0,0,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
                                NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
@@ -476,19 +529,19 @@
                         Grid.Row="3"
                         Width="{DynamicResource ColorViewComponentLabelWidth}"
                         Height="{Binding ElementName=Component2NumericUpDown, Path=Bounds.Height}"
-                        Background="{DynamicResource TextControlBackgroundDisabled}"
-                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                         BorderThickness="1,1,0,1"
-                        CornerRadius="4,0,0,4"
+                        CornerRadius="0,0,0,0"
                         VerticalAlignment="Center"
                         IsVisible="{TemplateBinding IsComponentTextInputVisible}">
                   <Panel HorizontalAlignment="Center"
                          VerticalAlignment="Center">
-                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
                                FontWeight="SemiBold"
                                Text="G"
                                IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
-                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
                                FontWeight="SemiBold"
                                Text="S"
                                IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
@@ -501,7 +554,7 @@
                                ShowButtonSpinner="False"
                                Height="32"
                                Width="{DynamicResource ColorViewComponentTextInputWidth}"
-                               CornerRadius="0,4,4,0"
+                               CornerRadius="0,0,0,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
                                NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
@@ -527,19 +580,19 @@
                         Grid.Row="4"
                         Width="{DynamicResource ColorViewComponentLabelWidth}"
                         Height="{Binding ElementName=Component3NumericUpDown, Path=Bounds.Height}"
-                        Background="{DynamicResource TextControlBackgroundDisabled}"
-                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                         BorderThickness="1,1,0,1"
-                        CornerRadius="4,0,0,4"
+                        CornerRadius="0,0,0,0"
                         VerticalAlignment="Center"
                         IsVisible="{TemplateBinding IsComponentTextInputVisible}">
                   <Panel HorizontalAlignment="Center"
                          VerticalAlignment="Center">
-                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
                                FontWeight="SemiBold"
                                Text="B"
                                IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Rgba}, Mode=OneWay}" />
-                    <TextBlock Foreground="{DynamicResource TextControlForegroundDisabled}"
+                    <TextBlock Foreground="{DynamicResource ThemeForegroundBrush}"
                                FontWeight="SemiBold"
                                Text="V"
                                IsVisible="{TemplateBinding ColorModel, Converter={StaticResource EnumToBoolConverter}, ConverterParameter={x:Static controls:ColorModel.Hsva}, Mode=OneWay}" />
@@ -552,7 +605,7 @@
                                ShowButtonSpinner="False"
                                Height="32"
                                Width="{DynamicResource ColorViewComponentTextInputWidth}"
-                               CornerRadius="0,4,4,0"
+                               CornerRadius="0,0,0,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
                                NumberFormat="{StaticResource ColorViewComponentNumberFormat}"
@@ -578,14 +631,14 @@
                         Grid.Row="5"
                         Width="{DynamicResource ColorViewComponentLabelWidth}"
                         Height="{Binding ElementName=AlphaComponentNumericUpDown, Path=Bounds.Height}"
-                        Background="{DynamicResource TextControlBackgroundDisabled}"
-                        BorderBrush="{DynamicResource TextControlBorderBrush}"
+                        Background="{DynamicResource ThemeControlMidBrush}"
+                        BorderBrush="{DynamicResource ThemeBorderMidBrush}"
                         BorderThickness="1,1,0,1"
-                        CornerRadius="4,0,0,4"
+                        CornerRadius="0,0,0,0"
                         VerticalAlignment="Center"
                         IsEnabled="{TemplateBinding IsAlphaEnabled}">
                   <TextBlock x:Name="AlphaComponentTextBlock"
-                             Foreground="{DynamicResource TextControlForegroundDisabled}"
+                             Foreground="{DynamicResource ThemeForegroundBrush}"
                              FontWeight="SemiBold"
                              Text="A"
                              HorizontalAlignment="Center"
@@ -606,7 +659,7 @@
                                ShowButtonSpinner="False"
                                Height="32"
                                Width="{DynamicResource ColorViewComponentTextInputWidth}"
-                               CornerRadius="0,4,4,0"
+                               CornerRadius="0,0,0,0"
                                Margin="0,0,12,0"
                                VerticalAlignment="Center"
                                NumberFormat="{StaticResource ColorViewComponentNumberFormat}"