diff --git a/MainWindow.xaml b/MainWindow.xaml
index 89bcc81..4c171ca 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -212,7 +212,7 @@
             <EventSetter Event="Loaded"
                          Handler="Button_Loaded" />
             <Setter Property="Background"
-                    Value="{DynamicResource inactiveButtonColor}" />
+                    Value="Transparent" />
             <Setter Property="Foreground"
                     Value="{DynamicResource navForeground}" />
             <Setter Property="BorderBrush"
@@ -525,6 +525,7 @@
                                     <Border Visibility="Hidden"
                                             Tag="ActiveIndicator"
                                             Panel.ZIndex="1001"
+                                            Opacity="0"
                                             Width="4"
                                             Height="34"
                                             HorizontalAlignment="Right"
@@ -542,17 +543,31 @@
                                     ClipToBounds="False"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center">
-                            <Image Source="{DynamicResource nav_appbar_newspaper}"
-                                   Panel.ZIndex="18"
-                                   Tag="ICO"
-                                   Style="{StaticResource ImageStyle}"
-                                   x:Name="icoAnn"
-                                   Stretch="Fill"
-                                   Width="34"
-                                   Height="34"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center"
-                                   Margin="14" />
+                            <Grid Width="34"
+                                  Height="34"
+                                  Margin="14">
+                                <Image Source="{DynamicResource nav_appbar_newspaper}"
+                                       Panel.ZIndex="18"
+                                       Tag="ICO"
+                                       Style="{StaticResource ImageStyle}"
+                                       x:Name="icoAnn"
+                                       Stretch="Fill"
+                                       Width="34"
+                                       Height="34"
+                                       HorizontalAlignment="Center"
+                                       VerticalAlignment="Center" />
+                                <Rectangle Tag="ActiveIcon"
+                                           Visibility="Hidden"
+                                           Panel.ZIndex="19"
+                                           Width="34"
+                                           Height="34"
+                                           Fill="{DynamicResource accentColor}">
+                                    <Rectangle.OpacityMask>
+                                        <ImageBrush ImageSource="{DynamicResource nav_appbar_newspaper}"
+                                                    Stretch="Fill" />
+                                    </Rectangle.OpacityMask>
+                                </Rectangle>
+                            </Grid>
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -585,6 +600,7 @@
                                     <Border Visibility="Hidden"
                                             Tag="ActiveIndicator"
                                             Panel.ZIndex="1001"
+                                            Opacity="0"
                                             Width="4"
                                             Height="34"
                                             HorizontalAlignment="Right"
@@ -600,15 +616,29 @@
                         <StackPanel x:Name="StackPanel"
                                     Orientation="Horizontal"
                                     Background="Transparent">
-                            <Image Source="{DynamicResource nav_appbar_clipboard_variant_text}"
-                                   x:Name="icoInc"
-                                   Tag="ICO"
-                                   Stretch="fill"
-                                   Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
-                                   Width="34"
-                                   Height="34"
-                                   Margin="14" />
+                            <Grid Width="34"
+                                  Height="34"
+                                  Margin="14">
+                                <Image Source="{DynamicResource nav_appbar_clipboard_variant_text}"
+                                       x:Name="icoInc"
+                                       Tag="ICO"
+                                       Stretch="fill"
+                                       Panel.ZIndex="18"
+                                       Style="{StaticResource ImageStyle}"
+                                       Width="34"
+                                       Height="34" />
+                                <Rectangle Tag="ActiveIcon"
+                                           Visibility="Hidden"
+                                           Panel.ZIndex="19"
+                                           Width="34"
+                                           Height="34"
+                                           Fill="{DynamicResource accentColor}">
+                                    <Rectangle.OpacityMask>
+                                        <ImageBrush ImageSource="{DynamicResource nav_appbar_clipboard_variant_text}"
+                                                    Stretch="Fill" />
+                                    </Rectangle.OpacityMask>
+                                </Rectangle>
+                            </Grid>
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -641,6 +671,7 @@
                                     <Border Visibility="Hidden"
                                             Tag="ActiveIndicator"
                                             Panel.ZIndex="1001"
+                                            Opacity="0"
                                             Width="4"
                                             Height="34"
                                             HorizontalAlignment="Right"
@@ -655,15 +686,29 @@
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
                                     Background="Transparent">
-                            <Image Source="{DynamicResource nav_appbar_cart}"
-                                   x:Name="icoSSP"
-                                   Stretch="fill"
-                                   Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
-                                   Width="34"
-                                   Height="34"
-                                   Margin="14"
-                                   Tag="ICO" />
+                            <Grid Width="34"
+                                  Height="34"
+                                  Margin="14">
+                                <Image Source="{DynamicResource nav_appbar_cart}"
+                                       x:Name="icoSSP"
+                                       Stretch="fill"
+                                       Panel.ZIndex="18"
+                                       Style="{StaticResource ImageStyle}"
+                                       Width="34"
+                                       Height="34"
+                                       Tag="ICO" />
+                                <Rectangle Tag="ActiveIcon"
+                                           Visibility="Hidden"
+                                           Panel.ZIndex="19"
+                                           Width="34"
+                                           Height="34"
+                                           Fill="{DynamicResource accentColor}">
+                                    <Rectangle.OpacityMask>
+                                        <ImageBrush ImageSource="{DynamicResource nav_appbar_cart}"
+                                                    Stretch="Fill" />
+                                    </Rectangle.OpacityMask>
+                                </Rectangle>
+                            </Grid>
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -697,6 +742,7 @@
                                     <Border Visibility="Hidden"
                                             Tag="ActiveIndicator"
                                             Panel.ZIndex="1001"
+                                            Opacity="0"
                                             Width="4"
                                             Height="34"
                                             HorizontalAlignment="Right"
@@ -711,15 +757,29 @@
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
                                     Background="Transparent">
-                            <Image Source="{DynamicResource nav_appbar_star}"
-                                   x:Name="icoCustomLinks"
-                                   Tag="ICO"
-                                   Stretch="fill"
-                                   Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
-                                   Width="34"
-                                   Height="34"
-                                   Margin="14" />
+                            <Grid Width="34"
+                                  Height="34"
+                                  Margin="14">
+                                <Image Source="{DynamicResource nav_appbar_star}"
+                                       x:Name="icoCustomLinks"
+                                       Tag="ICO"
+                                       Stretch="fill"
+                                       Panel.ZIndex="18"
+                                       Style="{StaticResource ImageStyle}"
+                                       Width="34"
+                                       Height="34" />
+                                <Rectangle Tag="ActiveIcon"
+                                           Visibility="Hidden"
+                                           Panel.ZIndex="19"
+                                           Width="34"
+                                           Height="34"
+                                           Fill="{DynamicResource accentColor}">
+                                    <Rectangle.OpacityMask>
+                                        <ImageBrush ImageSource="{DynamicResource nav_appbar_star}"
+                                                    Stretch="Fill" />
+                                    </Rectangle.OpacityMask>
+                                </Rectangle>
+                            </Grid>
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
@@ -753,6 +813,7 @@
                                     <Border Visibility="Hidden"
                                             Tag="ActiveIndicator"
                                             Panel.ZIndex="1001"
+                                            Opacity="0"
                                             Width="4"
                                             Height="34"
                                             HorizontalAlignment="Right"
@@ -767,15 +828,29 @@
                         </Button.Template>
                         <StackPanel Orientation="Horizontal"
                                     Background="Transparent">
-                            <Image Source="{DynamicResource nav_appbar_information}"
-                                   x:Name="icoInfo"
-                                   Tag="ICO"
-                                   Stretch="fill"
-                                   Panel.ZIndex="18"
-                                   Style="{StaticResource ImageStyle}"
-                                   Width="34"
-                                   Height="34"
-                                   Margin="14" />
+                            <Grid Width="34"
+                                  Height="34"
+                                  Margin="14">
+                                <Image Source="{DynamicResource nav_appbar_information}"
+                                       x:Name="icoInfo"
+                                       Tag="ICO"
+                                       Stretch="fill"
+                                       Panel.ZIndex="18"
+                                       Style="{StaticResource ImageStyle}"
+                                       Width="34"
+                                       Height="34" />
+                                <Rectangle Tag="ActiveIcon"
+                                           Visibility="Hidden"
+                                           Panel.ZIndex="19"
+                                           Width="34"
+                                           Height="34"
+                                           Fill="{DynamicResource accentColor}">
+                                    <Rectangle.OpacityMask>
+                                        <ImageBrush ImageSource="{DynamicResource nav_appbar_information}"
+                                                    Stretch="Fill" />
+                                    </Rectangle.OpacityMask>
+                                </Rectangle>
+                            </Grid>
                             <Image Source="Resources/StateOverlays/OverlayNewContentButton.png"
                                    Visibility="Collapsed"
                                    Panel.ZIndex="18"
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 42608c2..2796ce5 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -907,6 +907,13 @@ namespace C4IT_CustomerPanel
                 : visualHelper.FindVisualChild<FrameworkElement>(button, "ActiveIndicator");
         }
 
+        private FrameworkElement GetActiveTabIcon(Button button)
+        {
+            return button == null
+                ? null
+                : visualHelper.FindVisualChild<FrameworkElement>(button, "ActiveIcon");
+        }
+
         public void SetMenuAktivInaktiv(object sender, bool force, bool Silent = false)
         {
             Button clickedButton = (Button)sender;
@@ -914,22 +921,23 @@ namespace C4IT_CustomerPanel
 
             if (ActiveButton != clickedButton)
             {
-                SolidColorBrush btnColor1 = this.ConfigSettings.GetActiveButtonColor();
-                if (btnColor1 != null)
-                {
-                    clickedButton.Background = btnColor1;
+                clickedButton.Background = Brushes.Transparent;
+                FrameworkElement activeIndicator = GetActiveTabIndicator(clickedButton);
+                if (activeIndicator != null)
+                    activeIndicator.Visibility = Visibility.Visible;
+                FrameworkElement activeIcon = GetActiveTabIcon(clickedButton);
+                if (activeIcon != null)
+                    activeIcon.Visibility = Visibility.Visible;
 
-                    FrameworkElement activeIndicator = GetActiveTabIndicator(clickedButton);
-                    if (activeIndicator != null)
-                        activeIndicator.Visibility = Visibility.Visible;
-                }
-                SolidColorBrush btnColor2 = this.ConfigSettings.GetInactiveButtonColor();
-                if (btnColor2 != null && ActiveButton != null)
+                if (ActiveButton != null)
                 {
-                    ActiveButton.Background = btnColor2;
+                    ActiveButton.Background = Brushes.Transparent;
                     FrameworkElement inactiveIndicator = GetActiveTabIndicator(ActiveButton);
                     if (inactiveIndicator != null)
                         inactiveIndicator.Visibility = Visibility.Hidden;
+                    FrameworkElement inactiveIcon = GetActiveTabIcon(ActiveButton);
+                    if (inactiveIcon != null)
+                        inactiveIcon.Visibility = Visibility.Hidden;
                 }
                 ActiveButton = clickedButton;
             }
@@ -1716,15 +1724,7 @@ namespace C4IT_CustomerPanel
                 if (!(sender is Button bu))
                     return;
 
-                SolidColorBrush Col;
-                if (!Equals(ActiveButton, bu))
-                    Col = ConfigSettings.GetInactiveButtonColor();
-                else
-                    Col = ConfigSettings.GetActiveButtonColor();
-
-                var convertFromString = Col;
-                if (convertFromString != null)
-                    bu.Background = Col;
+                bu.Background = Brushes.Transparent;
             }
             catch (Exception exp)
             {
@@ -1782,6 +1782,9 @@ namespace C4IT_CustomerPanel
                 FrameworkElement activeIndicator = GetActiveTabIndicator(bu);
                 if (activeIndicator != null)
                     activeIndicator.Visibility = Visibility.Visible;
+                FrameworkElement activeIcon = GetActiveTabIcon(bu);
+                if (activeIcon != null)
+                    activeIcon.Visibility = Visibility.Visible;
             }
             catch (Exception E)
             {