diff --git a/src/Resources/Themes/Light.xaml b/src/Resources/Themes/Light.xaml
index ad3a3aaa..84d66ba0 100644
--- a/src/Resources/Themes/Light.xaml
+++ b/src/Resources/Themes/Light.xaml
@@ -1,11 +1,11 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="Brush.BG1" Color="#FFEEEEF2"/>
+    <SolidColorBrush x:Key="Brush.BG1" Color="#FFDFDFDF"/>
     <SolidColorBrush x:Key="Brush.BG2" Color="White"/>
     <SolidColorBrush x:Key="Brush.BG3" Color="WhiteSmoke"/>
     <SolidColorBrush x:Key="Brush.BG4" Color="#FFE6E7E8"/>
     <SolidColorBrush x:Key="Brush.BG5" Color="#FFBDBDBD"/>
-    <SolidColorBrush x:Key="Brush.BG6" Color="#FFCFCFCF"/>
+    <SolidColorBrush x:Key="Brush.BG6" Color="#FFFFFFFF"/>
     <SolidColorBrush x:Key="Brush.BG7" Color="#FF836C2E"/>
     <SolidColorBrush x:Key="Brush.Border1" Color="#FF898989"/>
     <SolidColorBrush x:Key="Brush.Border2" Color="#FFCFCFCF"/>
diff --git a/src/UI/Dashboard.xaml b/src/UI/Dashboard.xaml
index 39ff68a3..04698039 100644
--- a/src/UI/Dashboard.xaml
+++ b/src/UI/Dashboard.xaml
@@ -4,7 +4,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:source="clr-namespace:SourceGit"
              xmlns:local="clr-namespace:SourceGit.UI"
              xmlns:converters="clr-namespace:SourceGit.Converters"
              mc:Ignorable="d" 
@@ -32,7 +31,7 @@
         
         <!-- TitleBar -->
         <Grid Grid.Row="0" Panel.ZIndex="100">
-            <Border Background="{StaticResource Brush.BG1}" Margin="0,16,0,0">
+            <Border Background="{StaticResource Brush.BG1}" Margin="0,4,0,0">
                 <Border.Effect>
                     <DropShadowEffect ShadowDepth="2" Direction="270" Opacity=".5" Color="Black"/>
                 </Border.Effect>
diff --git a/src/UI/Launcher.xaml b/src/UI/Launcher.xaml
index 5b67b967..d161da78 100644
--- a/src/UI/Launcher.xaml
+++ b/src/UI/Launcher.xaml
@@ -50,12 +50,6 @@
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
-                <Border Grid.ColumnSpan="3" VerticalAlignment="Bottom" Margin="0,0,0,-1" Height="1" Background="{StaticResource Brush.BG1}">
-                    <Border.Effect>
-                        <DropShadowEffect ShadowDepth="0" Opacity="1"/>
-                    </Border.Effect>
-                </Border>
-
                 <!-- Tabs -->
                 <ScrollViewer x:Name="openedTabsScroller" Grid.Column="0" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled">
                     <TabControl x:Name="openedTabs" Padding="0" SnapsToDevicePixels="True" ItemsSource="{Binding ElementName=me, Path=Tabs}" SizeChanged="OpenedTabsSizeChanged">
@@ -140,11 +134,7 @@
                                     <Setter.Value>
                                         <ControlTemplate TargetType="{x:Type TabItem}">
                                             <Grid SnapsToDevicePixels="True" WindowChrome.IsHitTestVisibleInChrome="True" ToolTip="{Binding Tooltip}">
-                                                <Border x:Name="BG" Margin="-1,0" SnapsToDevicePixels="True" Background="Transparent" BorderThickness="0" BorderBrush="{StaticResource Brush.BG3}" CornerRadius="4,4,0,0">
-                                                    <Border.Effect>
-                                                        <DropShadowEffect ShadowDepth="0" Opacity=".7"/>
-                                                    </Border.Effect>
-                                                </Border>
+                                                <Border x:Name="BG" Margin="-1,0" SnapsToDevicePixels="True" Background="Transparent" CornerRadius="4,4,0,0"/>
 
                                                 <Rectangle
                                                     x:Name="Splitter"
@@ -182,8 +172,7 @@
                                             <ControlTemplate.Triggers>
                                                 <Trigger Property="IsSelected" Value="True">
                                                     <Setter Property="Panel.ZIndex" Value="2"/>
-                                                    <Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG1}"/>
-                                                    <Setter TargetName="BG" Property="BorderThickness" Value="1,1,1,0"/>
+                                                    <Setter TargetName="BG" Property="Background" Value="{StaticResource Brush.BG1}"/>
                                                     <Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG1}"/>
                                                     <Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG1}"/>
                                                 </Trigger>
@@ -198,7 +187,7 @@
                                                         <Condition Property="IsMouseOver" Value="True"/>
                                                     </MultiTrigger.Conditions>
                                                     <Setter Property="Panel.ZIndex" Value="1"/>
-                                                    <Setter TargetName="BG" Property="Background" Value="{DynamicResource Brush.BG5}"/>
+                                                    <Setter TargetName="BG" Property="Background" Value="{StaticResource Brush.BG5}"/>
                                                     <Setter TargetName="CornerLeft" Property="Fill" Value="{StaticResource Brush.BG5}"/>
                                                     <Setter TargetName="CornerRight" Property="Fill" Value="{StaticResource Brush.BG5}"/>
                                                 </MultiTrigger>