diff --git a/RetroBar/Resources/startvistaclassic.png b/RetroBar/Resources/startvistaclassic.png
new file mode 100644
index 00000000..00d679ff
Binary files /dev/null and b/RetroBar/Resources/startvistaclassic.png differ
diff --git a/RetroBar/RetroBar.csproj b/RetroBar/RetroBar.csproj
index 3404c247..1026f2df 100644
--- a/RetroBar/RetroBar.csproj
+++ b/RetroBar/RetroBar.csproj
@@ -14,6 +14,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="Resources\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Languages\*.xaml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -59,33 +63,6 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Update="Resources\startxpblue.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startnoir.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpbluebutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpclassic.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpembeddedbutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-	  <None Update="Resources\startxpgreenbutton.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-    <None Update="Resources\startxproyalebutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpsilverbutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpzunebutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/RetroBar/Themes/System XP.xaml b/RetroBar/Themes/System XP.xaml
index 9d61da35..8b66ca20 100644
--- a/RetroBar/Themes/System XP.xaml	
+++ b/RetroBar/Themes/System XP.xaml	
@@ -1,5 +1,34 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="Transparent" />
+
     <BitmapImage x:Key="StartIconImage"
                  UriSource="../Resources/startxpclassic.png" />
+
+    <Style TargetType="Image"
+           x:Key="StartIcon"
+           BasedOn="{StaticResource StartIcon}">
+        <Setter Property="Margin"
+                Value="-2,0,2,0" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,0,-1,1" />
+    </Style>
+
+    <Style TargetType="MenuItem"
+           x:Key="TaskManMenuItem">
+        <Setter Property="Header"
+                Value="{DynamicResource show_taskman}" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="Clock"
+           BasedOn="{StaticResource Clock}">
+        <Setter Property="Margin"
+                Value="5,-1,5,0" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index 2d8c5c22..ac18fe13 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -462,6 +462,18 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ClassicFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle RenderOptions.EdgeMode="Aliased" Margin="5" StrokeThickness="1"
+                               Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                               StrokeDashOffset="1.5" StrokeDashArray="1" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <ToolTip x:Key="StartButtonTip" Content="{DynamicResource start_button_tip}" />
 
     <Style TargetType="ToggleButton"
@@ -476,6 +488,8 @@
                 Value="0,0,2,0" />
         <Setter Property="HorizontalAlignment"
                 Value="Left" />
+        <Setter Property="FocusVisualStyle"
+                Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
@@ -495,7 +509,7 @@
                                             Background="{TemplateBinding Background}"
                                             Padding="2,1"
                                             x:Name="ButtonInnerTopBorder">
-                                        <ContentPresenter />
+                                        <ContentPresenter Name="Content" />
                                     </Border>
                                 </Border>
                             </Border>
@@ -516,6 +530,9 @@
                             <Setter TargetName="ButtonInnerTopBorder"
                                     Property="BorderBrush"
                                     Value="{DynamicResource ButtonShadow}" />
+                            <Setter TargetName="Content"
+                                    Property="Margin"
+                                    Value="1,1,-1,-1" />
                         </Trigger>
                         <Trigger Property="IsPressed"
                                  Value="True">
@@ -531,6 +548,9 @@
                             <Setter TargetName="ButtonInnerTopBorder"
                                     Property="BorderBrush"
                                     Value="{DynamicResource ButtonShadow}" />
+                            <Setter TargetName="Content"
+                                    Property="Margin"
+                                    Value="1,1,-1,-1" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/RetroBar/Themes/Windows 2000.xaml b/RetroBar/Themes/Windows 2000.xaml
index eb2fbcfc..9e503bd7 100644
--- a/RetroBar/Themes/Windows 2000.xaml	
+++ b/RetroBar/Themes/Windows 2000.xaml	
@@ -18,5 +18,12 @@
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
 
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,-1,0,0" />
+    </Style>
+
     <FontFamily x:Key="GlobalFontFamily">Tahoma</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows 95-98.xaml b/RetroBar/Themes/Windows 95-98.xaml
index c7aaa3a4..a1e8601a 100644
--- a/RetroBar/Themes/Windows 95-98.xaml	
+++ b/RetroBar/Themes/Windows 95-98.xaml	
@@ -20,5 +20,12 @@
 
     <ToolTip x:Key="StartButtonTip" Content="{DynamicResource start_button_tip_98}" />
 
+    <Style TargetType="ToggleButton"
+           x:Key="StartButton"
+           BasedOn="{StaticResource StartButton}">
+        <Setter Property="FocusVisualStyle"
+                Value="{StaticResource ClassicFocusVisual}" />
+    </Style>
+
     <FontFamily x:Key="GlobalFontFamily">Microsoft Sans Serif</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows Me.xaml b/RetroBar/Themes/Windows Me.xaml
index 23420984..a114eee0 100644
--- a/RetroBar/Themes/Windows Me.xaml	
+++ b/RetroBar/Themes/Windows Me.xaml	
@@ -4,5 +4,19 @@
         <ResourceDictionary Source="Windows 2000.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,-1,1,0" />
+    </Style>
+
+    <Style TargetType="ToggleButton"
+           x:Key="StartButton"
+           BasedOn="{StaticResource StartButton}">
+        <Setter Property="FocusVisualStyle"
+                Value="{StaticResource ClassicFocusVisual}" />
+    </Style>
+
     <FontFamily x:Key="GlobalFontFamily">Microsoft Sans Serif</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows Vista Classic.xaml b/RetroBar/Themes/Windows Vista Classic.xaml
new file mode 100644
index 00000000..4fbb300a
--- /dev/null
+++ b/RetroBar/Themes/Windows Vista Classic.xaml	
@@ -0,0 +1,33 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Windows XP Classic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <BitmapImage x:Key="StartIconImage"
+                 UriSource="../Resources/startvistaclassic.png" />
+
+    <ToolTip x:Key="StartButtonTip"
+             Content="{DynamicResource start_button_tip_vista}" />
+
+    <Style TargetType="Image"
+           x:Key="StartIcon"
+           BasedOn="{StaticResource StartIcon}">
+        <Setter Property="Margin"
+                Value="-2,0,1,0" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,0,0,1" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="Clock"
+           BasedOn="{StaticResource Clock}">
+        <Setter Property="Margin"
+                Value="3,-1,5,0" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows XP Blue.xaml b/RetroBar/Themes/Windows XP Blue.xaml
index 9d9e9925..42d1797c 100644
--- a/RetroBar/Themes/Windows XP Blue.xaml	
+++ b/RetroBar/Themes/Windows XP Blue.xaml	
@@ -1167,6 +1167,8 @@
                 Value="99" />
         <Setter Property="Height"
                 Value="32" />
+        <Setter Property="FocusVisualStyle"
+                Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
diff --git a/RetroBar/Themes/Windows XP Classic.xaml b/RetroBar/Themes/Windows XP Classic.xaml
index 5acd18f0..b6a62e07 100644
--- a/RetroBar/Themes/Windows XP Classic.xaml	
+++ b/RetroBar/Themes/Windows XP Classic.xaml	
@@ -2,37 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Windows 2000.xaml" />
+        <ResourceDictionary Source="System XP.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
-    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="Transparent" />
-
-    <BitmapImage x:Key="StartIconImage"
-                 UriSource="../Resources/startxpclassic.png" />
-
-    <Style TargetType="Image"
-           x:Key="StartIcon"
-           BasedOn="{StaticResource StartIcon}">
-        <Setter Property="Margin"
-                Value="-2,0,2,0" />
-    </Style>
-
-    <Style TargetType="TextBlock"
-           x:Key="StartLabel"
-           BasedOn="{StaticResource StartLabel}">
-        <Setter Property="Margin"
-                Value="0,0,-1,1" />
-    </Style>
-
-    <Style TargetType="MenuItem"
-           x:Key="TaskManMenuItem">
-        <Setter Property="Header"
-                Value="{DynamicResource show_taskman}" />
-    </Style>
-
-    <Style TargetType="TextBlock"
-           x:Key="Clock"
-           BasedOn="{StaticResource Clock}">
-        <Setter Property="Margin"
-                Value="5,-1,5,0" />
-    </Style>
 </ResourceDictionary>
\ No newline at end of file