diff --git a/Icarus/CustomControls/CheckedImageRadioButton.xaml b/Icarus/CustomControls/CheckedImageRadioButton.xaml
new file mode 100644
index 0000000..ba41992
--- /dev/null
+++ b/Icarus/CustomControls/CheckedImageRadioButton.xaml
@@ -0,0 +1,49 @@
+<RadioButton x:Class="CheckedImageRadioButton"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <RadioButton.Resources>
+      <SolidColorBrush x:Key="RadioButton.MouseOver.Background" Color="White"/>
+      <SolidColorBrush x:Key="RadioButton.MouseOver.Border" Color="#FF5593FF"/>
+      <SolidColorBrush x:Key="RadioButton.Pressed.Background" Color="#afcfe9"/>
+      <SolidColorBrush x:Key="RadioButton.Pressed.Border" Color="#FF3C77DD"/>
+      <SolidColorBrush x:Key="RadioButton.Disabled.Background" Color="#FFE6E6E6"/>
+      <SolidColorBrush x:Key="RadioButton.Disabled.Border" Color="#FFBCBCBC"/>
+   </RadioButton.Resources>
+   <RadioButton.Template>
+      <ControlTemplate TargetType="{x:Type RadioButton}">
+         <Border x:Name="RadioButtonBorder" 
+                 CornerRadius="4" 
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}" 
+                 BorderThickness="{TemplateBinding BorderThickness}" 
+                 SnapsToDevicePixels="True">
+            <Image x:Name="RadioButtonImage" 
+                   Source="{Binding ImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}"
+                   Stretch="Uniform"
+                   Focusable="False"
+                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                   Margin="{TemplateBinding Padding}"
+                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+         </Border>
+         <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="true">
+               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.MouseOver.Background}"/>
+               <Setter Property="BorderBrush" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.MouseOver.Border}"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Disabled.Background}"/>
+               <Setter Property="BorderBrush" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Disabled.Border}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="true">
+               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Pressed.Background}"/>
+               <Setter Property="BorderBrush" TargetName="RadioButtonBorder" Value="{StaticResource RadioButton.Pressed.Border}"/>
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+               <Setter Property="Source" TargetName="RadioButtonImage" Value="{Binding CheckedImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}"/>
+               <Setter Property="Background" TargetName="RadioButtonBorder" Value="{StaticResource Icarus_Gray}"/>
+            </Trigger>
+         </ControlTemplate.Triggers>
+      </ControlTemplate>
+   </RadioButton.Template>
+</RadioButton>
diff --git a/Icarus/CustomControls/CheckedImageRadioButton.xaml.vb b/Icarus/CustomControls/CheckedImageRadioButton.xaml.vb
new file mode 100644
index 0000000..10b558b
--- /dev/null
+++ b/Icarus/CustomControls/CheckedImageRadioButton.xaml.vb
@@ -0,0 +1,25 @@
+Public Class CheckedImageRadioButton
+
+   Public Shared ReadOnly ImageSourceProperty As DependencyProperty = DependencyProperty.Register("ImageSource", GetType(String), GetType(CheckedImageRadioButton), New FrameworkPropertyMetadata(""))
+
+   Public Shadows Property ImageSource As String
+      Get
+         Return CStr(MyBase.GetValue(ImageSourceProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(ImageSourceProperty, value)
+      End Set
+   End Property
+
+   Public Shared ReadOnly CheckedImageSourceProperty As DependencyProperty = DependencyProperty.Register("CheckedImageSource", GetType(String), GetType(CheckedImageRadioButton), New FrameworkPropertyMetadata(""))
+
+   Public Shadows Property CheckedImageSource As String
+      Get
+         Return CStr(MyBase.GetValue(CheckedImageSourceProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(ImageSourceProperty, value)
+      End Set
+   End Property
+
+End Class
diff --git a/Icarus/CustomControls/CheckedImageToggleButton.xaml b/Icarus/CustomControls/CheckedImageToggleButton.xaml
new file mode 100644
index 0000000..51ea129
--- /dev/null
+++ b/Icarus/CustomControls/CheckedImageToggleButton.xaml
@@ -0,0 +1,47 @@
+<ToggleButton x:Class="CheckedImageToggleButton"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+   <ToggleButton.Template>
+      <ControlTemplate TargetType="{x:Type ToggleButton}">
+         <Border Name="ToggleButtonBorder" 
+                 CornerRadius="4"
+                 Background="{TemplateBinding Background}" 
+                 BorderBrush="{TemplateBinding BorderBrush}" 
+                 BorderThickness="{TemplateBinding BorderThickness}" 
+                 SnapsToDevicePixels="true">
+            <Image Name="ToggleButtonImage" 
+                   Height="{DynamicResource ToggleButton.Image.Height}"
+                   Width="{DynamicResource ToggleButton.Image.Width}"
+                   Stretch="Uniform"
+                   Source="{Binding ImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}" 
+                   Focusable="False" 
+                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                   Margin="{TemplateBinding Padding}" 
+                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+         </Border>
+         <ControlTemplate.Triggers>
+            <Trigger Property="Button.IsDefaulted" Value="true">
+               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="true">
+               <Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.MouseOver.Background}"/>
+               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.MouseOver.Border}"/>
+            </Trigger>
+            <Trigger Property="IsPressed" Value="true">
+               <Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Pressed.Background}"/>
+               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Pressed.Border}"/>
+            </Trigger>
+            <Trigger Property="IsChecked" Value="true">
+               <Setter Property="Source" TargetName="ToggleButtonImage" Value="{Binding CheckedImageSource, RelativeSource={RelativeSource AncestorType={x:Type ToggleButton}}}"/>
+               <Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Icarus_Gray}"/>
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+               <!--<Setter Property="Background" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Disabled.Background}"/>-->
+               <Setter Property="BorderBrush" TargetName="ToggleButtonBorder" Value="{StaticResource Button.NoBackground.Disabled.Border}"/>
+               <Setter Property="OpacityMask" Value="#54707070"/>
+            </Trigger>
+         </ControlTemplate.Triggers>
+      </ControlTemplate>
+   </ToggleButton.Template>
+</ToggleButton>
diff --git a/Icarus/CustomControls/CheckedImageToggleButton.xaml.vb b/Icarus/CustomControls/CheckedImageToggleButton.xaml.vb
new file mode 100644
index 0000000..5377626
--- /dev/null
+++ b/Icarus/CustomControls/CheckedImageToggleButton.xaml.vb
@@ -0,0 +1,25 @@
+Public Class CheckedImageToggleButton
+
+   Public Shared ReadOnly ImageSourceProperty As DependencyProperty = DependencyProperty.Register("ImageSource", GetType(String), GetType(CheckedImageToggleButton), New FrameworkPropertyMetadata(""))
+
+   Public Shadows Property ImageSource As String
+      Get
+         Return CStr(MyBase.GetValue(ImageSourceProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(ImageSourceProperty, value)
+      End Set
+   End Property
+
+   Public Shared ReadOnly CheckedImageSourceProperty As DependencyProperty = DependencyProperty.Register("CheckedImageSource", GetType(String), GetType(CheckedImageToggleButton), New FrameworkPropertyMetadata(""))
+
+   Public Shadows Property CheckedImageSource As String
+      Get
+         Return CStr(MyBase.GetValue(CheckedImageSourceProperty))
+      End Get
+      Set(value As String)
+         MyBase.SetValue(ImageSourceProperty, value)
+      End Set
+   End Property
+
+End Class
diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj
index 48f333d..45203b0 100644
--- a/Icarus/Icarus.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -139,6 +139,12 @@
       <DependentUpon>CurrLayerSliderV.xaml</DependentUpon>
     </Compile>
     <Compile Include="CurrLayerSlider\CurrLayerSliderVM.vb" />
+    <Compile Include="CustomControls\CheckedImageRadioButton.xaml.vb">
+      <DependentUpon>CheckedImageRadioButton.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CustomControls\CheckedImageToggleButton.xaml.vb">
+      <DependentUpon>CheckedImageToggleButton.xaml</DependentUpon>
+    </Compile>
     <Compile Include="DataGridMultiselectManaging\IListItemConverter.vb" />
     <Compile Include="DataGridMultiselectManaging\MultiSelectorBehaviours.vb" />
     <Compile Include="DataGridMultiselectManaging\TwoListSynchronizer.vb" />
@@ -323,6 +329,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="CustomControls\CheckedImageRadioButton.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CustomControls\CheckedImageToggleButton.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DispositionPanel\DispositionPanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -689,6 +703,24 @@
   <ItemGroup>
     <Resource Include="Resources\ProjectManager\Export.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ShowPanel\CurveDir_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ShowPanel\RenderingHL_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ShowPanel\RenderingSH_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ShowPanel\RenderingWF_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\InstrumentPanel\EdgeAnalysis_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\InstrumentPanel\GetDist_White.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
diff --git a/Icarus/InstrumentPanel/InstrumentPanelV.xaml b/Icarus/InstrumentPanel/InstrumentPanelV.xaml
index bdc973d..4eda202 100644
--- a/Icarus/InstrumentPanel/InstrumentPanelV.xaml
+++ b/Icarus/InstrumentPanel/InstrumentPanelV.xaml
@@ -1,26 +1,29 @@
 <StackPanel x:Class="InstrumentPanelV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+            xmlns:local="clr-namespace:Icarus"
             Orientation="Horizontal">
 
-   <ToggleButton ToolTip="{Binding GetDistToolTip}"
-                 IsChecked="{Binding GetDistIsChecked}"
-                 Width="15"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/InstrumentPanel/GetDist.png"
-             Height="25"
-             Width="25"
-             HorizontalAlignment="Center"
-             Style="{StaticResource Button_Image}"/>
-   </ToggleButton>
-   <ToggleButton ToolTip="{Binding EdgeAnalysisToolTip}"
-                 IsChecked="{Binding bEdgeAnalysis_IsChecked}"
-                 IsEnabled="{Binding bEdgeAnalysis_IsEnabled}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/InstrumentPanel/EdgeAnalysis.png"
-             Style="{StaticResource Button_Image}"/>
-   </ToggleButton>
+   <local:CheckedImageToggleButton ToolTip="{Binding GetDistToolTip}"
+                                   IsChecked="{Binding GetDistIsChecked}"
+                                   ImageSource="/Resources/InstrumentPanel/GetDist.png"
+                                   CheckedImageSource="/Resources/InstrumentPanel/GetDist_White.png"
+                                   Width="15"
+                                   Margin="2.5,0,2.5,0"
+                                   Style="{StaticResource BottomPanel_ToggleButton}">
+      <local:CheckedImageToggleButton.Resources>
+         <sys:Double x:Key="ToggleButton.Image.Height">25</sys:Double>
+         <sys:Double x:Key="ToggleButton.Image.Width">25</sys:Double>
+      </local:CheckedImageToggleButton.Resources>
+   </local:CheckedImageToggleButton>
+   <local:CheckedImageToggleButton ToolTip="{Binding EdgeAnalysisToolTip}"
+                                   IsChecked="{Binding bEdgeAnalysis_IsChecked}"
+                                   IsEnabled="{Binding bEdgeAnalysis_IsEnabled}"
+                                   ImageSource="/Resources/InstrumentPanel/EdgeAnalysis.png"
+                                   CheckedImageSource="/Resources/InstrumentPanel/EdgeAnalysis_White.png"
+                                   Margin="2.5,0,2.5,0"
+                                   Style="{StaticResource BottomPanel_ToggleButton}">
+   </local:CheckedImageToggleButton>
 
 </StackPanel>
diff --git a/Icarus/Resources/InstrumentPanel/EdgeAnalysis_White.png b/Icarus/Resources/InstrumentPanel/EdgeAnalysis_White.png
new file mode 100644
index 0000000..e093d05
Binary files /dev/null and b/Icarus/Resources/InstrumentPanel/EdgeAnalysis_White.png differ
diff --git a/Icarus/Resources/InstrumentPanel/GetDist_White.png b/Icarus/Resources/InstrumentPanel/GetDist_White.png
new file mode 100644
index 0000000..347bb3d
Binary files /dev/null and b/Icarus/Resources/InstrumentPanel/GetDist_White.png differ
diff --git a/Icarus/Resources/ProjectManager/Import.png b/Icarus/Resources/ProjectManager/Import.png
index c114e05..5fb8d4b 100644
Binary files a/Icarus/Resources/ProjectManager/Import.png and b/Icarus/Resources/ProjectManager/Import.png differ
diff --git a/Icarus/Resources/ProjectManager/Options.png b/Icarus/Resources/ProjectManager/Options.png
index d5015b2..4163449 100644
Binary files a/Icarus/Resources/ProjectManager/Options.png and b/Icarus/Resources/ProjectManager/Options.png differ
diff --git a/Icarus/Resources/ProjectManager/SaveAs.png b/Icarus/Resources/ProjectManager/SaveAs.png
index 9b22379..91c00a3 100644
Binary files a/Icarus/Resources/ProjectManager/SaveAs.png and b/Icarus/Resources/ProjectManager/SaveAs.png differ
diff --git a/Icarus/Resources/ShowPanel/CurveDir_White.png b/Icarus/Resources/ShowPanel/CurveDir_White.png
new file mode 100644
index 0000000..0b7cef3
Binary files /dev/null and b/Icarus/Resources/ShowPanel/CurveDir_White.png differ
diff --git a/Icarus/Resources/ShowPanel/RenderingHL_White.png b/Icarus/Resources/ShowPanel/RenderingHL_White.png
new file mode 100644
index 0000000..2bbd86d
Binary files /dev/null and b/Icarus/Resources/ShowPanel/RenderingHL_White.png differ
diff --git a/Icarus/Resources/ShowPanel/RenderingSH_White.png b/Icarus/Resources/ShowPanel/RenderingSH_White.png
new file mode 100644
index 0000000..6b2bbe4
Binary files /dev/null and b/Icarus/Resources/ShowPanel/RenderingSH_White.png differ
diff --git a/Icarus/Resources/ShowPanel/RenderingWF_White.png b/Icarus/Resources/ShowPanel/RenderingWF_White.png
new file mode 100644
index 0000000..e6f1b7d
Binary files /dev/null and b/Icarus/Resources/ShowPanel/RenderingWF_White.png differ
diff --git a/Icarus/ShowPanel/ShowPanelV.xaml b/Icarus/ShowPanel/ShowPanelV.xaml
index 21b0e21..99afe9c 100644
--- a/Icarus/ShowPanel/ShowPanelV.xaml
+++ b/Icarus/ShowPanel/ShowPanelV.xaml
@@ -1,35 +1,33 @@
 <UniformGrid x:Class="ShowPanelV"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Icarus"
              Rows="1">
 
-   <RadioButton ToolTip="{Binding RenderingWFToolTip}"
-                IsChecked="{Binding WireframeIsChecked}"
-                Margin="2.5,0,2.5,0"
-                Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingWF.png"
-             Style="{StaticResource Button_Image}"/>
-   </RadioButton>
-   <RadioButton ToolTip="{Binding RenderingHLToolTip}"
-                IsChecked="{Binding HiddenLineIsChecked}"
-                Margin="2.5,0,2.5,0"
-                Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingHL.png"
-             Style="{StaticResource Button_Image}"/>
-   </RadioButton>
-   <RadioButton ToolTip="{Binding RenderingSHToolTip}"
-                IsChecked="{Binding ShadingIsChecked}"
-                Margin="2.5,0,2.5,0"
-                Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/RenderingSH.png"
-             Style="{StaticResource Button_Image}"/>
-   </RadioButton>
-   <ToggleButton ToolTip="{Binding CurveDirToolTip}" 
-                 IsChecked="{Binding CurveDirIsChecked}"
-                 Margin="2.5,0,2.5,0"
-                 Style="{StaticResource ToolBar_ToggleButton}">
-      <Image Source="/Resources/ShowPanel/CurveDir.png"
-             Style="{StaticResource Button_Image}"/>
-   </ToggleButton>
+   <local:CheckedImageRadioButton ToolTip="{Binding RenderingWFToolTip}"
+                                  IsChecked="{Binding WireframeIsChecked}"
+                                  ImageSource="/Resources/ShowPanel/RenderingWF.png"
+                                  CheckedImageSource="/Resources/ShowPanel/RenderingWF_White.png"
+                                  Margin="2.5,0,2.5,0"
+                                  Style="{StaticResource BottomPanel_ToggleButton}"/>
+   <local:CheckedImageRadioButton ToolTip="{Binding RenderingHLToolTip}"
+                                  IsChecked="{Binding HiddenLineIsChecked}"
+                                  ImageSource="/Resources/ShowPanel/RenderingHL.png"
+                                  CheckedImageSource="/Resources/ShowPanel/RenderingHL_White.png"
+                                  Margin="2.5,0,2.5,0"
+                                  Style="{StaticResource BottomPanel_ToggleButton}"/>
+   <local:CheckedImageRadioButton ToolTip="{Binding RenderingSHToolTip}"
+                                  IsChecked="{Binding ShadingIsChecked}"
+                                  ImageSource="/Resources/ShowPanel/RenderingSH.png"
+                                  CheckedImageSource="/Resources/ShowPanel/RenderingSH_White.png"
+                                  Margin="2.5,0,2.5,0"
+                                  Style="{StaticResource BottomPanel_ToggleButton}"/>
+   <local:CheckedImageToggleButton ToolTip="{Binding CurveDirToolTip}" 
+                                   IsChecked="{Binding CurveDirIsChecked}"
+                                   ImageSource="/Resources/ShowPanel/CurveDir.png"
+                                   CheckedImageSource="/Resources/ShowPanel/CurveDir_White.png"
+                                   Margin="2.5,0,2.5,0"
+                                   Style="{StaticResource BottomPanel_ToggleButton}"/>
+
 
 </UniformGrid>
diff --git a/Icarus/SliderManager/LayerIndexSliderV.xaml b/Icarus/SliderManager/LayerIndexSliderV.xaml
index ee0a83f..61418ff 100644
--- a/Icarus/SliderManager/LayerIndexSliderV.xaml
+++ b/Icarus/SliderManager/LayerIndexSliderV.xaml
@@ -57,6 +57,7 @@
       </Grid>
       <Icarus:ShowValueSlider Grid.Row="3"
                               Orientation="Vertical"
+                              Width="36"
                               Value="{Binding nLayerIndex}"
                               Minimum="{Binding nLayerIndex_Minimum}"
                               Maximum="{Binding nLayerIndex_Maximum}"
diff --git a/Icarus/StatusBar/MyStatusBarVM.vb b/Icarus/StatusBar/MyStatusBarVM.vb
index 7b0a261..b88ad8d 100644
--- a/Icarus/StatusBar/MyStatusBarVM.vb
+++ b/Icarus/StatusBar/MyStatusBarVM.vb
@@ -131,13 +131,22 @@ Public Class MyStatusBarVM
 
    Friend Overloads Sub SetCurrPos(sCurrPos As String)
       Dim sSplitCurrPos() As String = sCurrPos.Split(" "c)
+      Dim bX As Boolean = False
+      Dim bY As Boolean = False
+      Dim bZ As Boolean = False
       Dim dX As Double = 0
       Dim dY As Double = 0
       Dim dZ As Double = 0
-      StringToDouble(sSplitCurrPos(0).Trim({"X"c, "x"c, "="c}), dX)
-      StringToDouble(sSplitCurrPos(1).Trim({"Y"c, "y"c, "="c}), dY)
-      StringToDouble(sSplitCurrPos(2).Trim({"Z"c, "z"c, "="c}), dZ)
-      m_CurrPos = "X=" & DoubleToString(dX, -2) & "Y=" & DoubleToString(dY, -2) & "Z=" & DoubleToString(dZ, -2)
+      For Each Axis In sSplitCurrPos
+         If Axis.Contains("X"c) OrElse Axis.Contains("x"c) Then
+            bX = StringToDouble(Axis.Trim({"X"c, "x"c, "="c}), dX)
+         ElseIf Axis.Contains("Y"c) OrElse Axis.Contains("y"c) Then
+            bY = StringToDouble(Axis.Trim({"Y"c, "y"c, "="c}), dY)
+         ElseIf Axis.Contains("Z"c) OrElse Axis.Contains("z"c) Then
+            bZ = StringToDouble(Axis.Trim({"Z"c, "z"c, "="c}), dZ)
+         End If
+      Next
+      m_CurrPos = If(bX, "X=" & DoubleToString(dX, -2) & If(bY Or bZ, " ", ""), "") & If(bY, "Y=" & DoubleToString(dY, -2) & If(bZ, " ", ""), "") & If(bZ, "Z=" & DoubleToString(dZ, -2), "")
       NotifyPropertyChanged("CurrPos")
    End Sub
 
diff --git a/Icarus/StatusBar/StatusBarV.xaml b/Icarus/StatusBar/StatusBarV.xaml
index b37e7d1..3154750 100644
--- a/Icarus/StatusBar/StatusBarV.xaml
+++ b/Icarus/StatusBar/StatusBarV.xaml
@@ -38,24 +38,12 @@
                     HorizontalAlignment="Center"
                     Margin="0,0,0,2.5"/>
          <!--Indica se la griglia è attiva o disattiva-->
-         <ToggleButton Grid.Row="1"
-                       IsChecked="{Binding bGridVisibility}"
-                       Margin="0,2.5,0,0"
-                       Style="{StaticResource StatusBar_ToggleButton}">
-            <ToggleButton.Template>
-               <ControlTemplate TargetType="ToggleButton">
-                  <Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
-                     <Image Name="LogoImage" Stretch="Uniform" Source="/Resources/StatusBar/GridVisibility.png" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                  </Border>
-                  <ControlTemplate.Triggers>
-                     <Trigger Property="IsChecked" Value="True">
-                        <Setter Property="Source" TargetName="LogoImage" Value="/Resources/StatusBar/GridVisibilityWhite.png"/>
-                        <Setter Property="Background" TargetName="border" Value="{StaticResource Icarus_Gray}"/>
-                     </Trigger>
-                  </ControlTemplate.Triggers>
-               </ControlTemplate>
-            </ToggleButton.Template>
-         </ToggleButton>
+         <PrintApp:CheckedImageToggleButton Grid.Row="1"
+                                            IsChecked="{Binding bGridVisibility}"
+                                            ImageSource="/Resources/StatusBar/GridVisibility.png"
+                                            CheckedImageSource="/Resources/StatusBar/GridVisibilityWhite.png"
+                                            Margin="0,2.5,0,0"
+                                            Style="{StaticResource StatusBar_ToggleButton}"/>
       </Grid>
    </Border>
    
diff --git a/Icarus/TSFEditor/TFSEditorV.xaml b/Icarus/TSFEditor/TFSEditorV.xaml
index 093fa19..d7063dd 100644
--- a/Icarus/TSFEditor/TFSEditorV.xaml
+++ b/Icarus/TSFEditor/TFSEditorV.xaml
@@ -156,6 +156,8 @@
                    PrintApp:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding SelLayers}"
                    SelectedItem="{Binding SelLayer}"
                    SelectionMode="Extended"
+                   HorizontalGridLinesBrush="White"
+                   VerticalGridLinesBrush="White"
                    Margin="0,2.5,0,2.5">
             <DataGrid.Columns>
                <DataGridTextColumn Header="Index" 
diff --git a/Icarus/TSFEditor/TFSEditorVM.vb b/Icarus/TSFEditor/TFSEditorVM.vb
index 682119c..7cfced1 100644
--- a/Icarus/TSFEditor/TFSEditorVM.vb
+++ b/Icarus/TSFEditor/TFSEditorVM.vb
@@ -746,7 +746,13 @@ Public Class TFSLayer
          If m_bFCurr_IsModified OrElse m_bTWait_IsModified Then
             Return Brushes.Black
          ElseIf m_dSpeed <= Map.refTFSEditorVM.dSpeedMin OrElse m_dSpeed >= Map.refTFSEditorVM.dSpeedMax Then
-            Return New BrushConverter().ConvertFrom("#402918")
+            If (Not Map.refTFSEditorVM.bWaitingTime AndAlso m_dTCurr + 1 < m_dTMin) OrElse
+               (Map.refTFSEditorVM.bWaitingTime AndAlso m_dTCurr + m_dTWait + 1 < m_dTMin) OrElse
+               m_dTCurr - 1 > m_dTMax Then
+               Return New BrushConverter().ConvertFrom("#63181b")
+            Else
+               Return New BrushConverter().ConvertFrom("#961824")
+            End If
          Else
             Return Brushes.White
          End If
diff --git a/Icarus/Utility/Dictionary.xaml b/Icarus/Utility/Dictionary.xaml
index 8864959..817926a 100644
--- a/Icarus/Utility/Dictionary.xaml
+++ b/Icarus/Utility/Dictionary.xaml
@@ -1,10 +1,11 @@
-<ResourceDictionary
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:PrintApp="clr-namespace:Icarus"
-   xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:PrintApp="clr-namespace:Icarus"
+                    xmlns:Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"
+                    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                    xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+>
 
    <!-- 
    Assign a Key to every Panel ViewModel to use 
@@ -92,9 +93,9 @@
    <SolidColorBrush x:Key="Icarus_Gray" Color="#92908d" />
    <SolidColorBrush x:Key="Icarus_LightBlue" Color="#3c89c9" />
    <SolidColorBrush x:Key="Icarus_Blue" Color="#2e5a81" />
-   <SolidColorBrush x:Key="Icarus_Green" Color="#40826d" />
-   <SolidColorBrush x:Key="Icarus_Orange" Color="#C37636" />
-   <SolidColorBrush x:Key="Icarus_Purple" Color="#990066" />
+   <SolidColorBrush x:Key="Icarus_Green" Color="#50A388" />
+   <SolidColorBrush x:Key="Icarus_Orange" Color="#bc373e" />
+   <SolidColorBrush x:Key="Icarus_Purple" Color="#A74C77" />
 
    <!--Colori per EgtWPFLib5-->
    <SolidColorBrush x:Key="TextBox.Static.Border" Color="#FFABAdB3"/>
@@ -127,14 +128,22 @@
 
    <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD"/>
    <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070"/>
-   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD"/>
+   <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#afcfe9"/>
    <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1"/>
-   <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FF50E6FD"/>
+   <SolidColorBrush x:Key="Button.Pressed.Background" Color="#b5b4b2"/>
    <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B"/>
    <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4"/>
    <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5"/>
    <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383"/>
 
+   <SolidColorBrush x:Key="Button.NoBackground.MouseOver.Background" Color="White"/>
+   <SolidColorBrush x:Key="Button.NoBackground.MouseOver.Border" Color="#FF3C7FB1"/>
+   <SolidColorBrush x:Key="Button.NoBackground.Pressed.Background" Color="#afcfe9"/>
+   <SolidColorBrush x:Key="Button.NoBackground.Pressed.Border" Color="#FF2C628B"/>
+   <SolidColorBrush x:Key="Button.NoBackground.Disabled.Background" Color="#FFF4F4F4"/>
+   <SolidColorBrush x:Key="Button.NoBackground.Disabled.Border" Color="#FFADB2B5"/>
+   <SolidColorBrush x:Key="Button.NoBackground.Disabled.Foreground" Color="#FF838383"/>
+
    <ControlTemplate x:Key="Button.HalfRoundButton" TargetType="{x:Type Button}">
       <Border x:Name="border" CornerRadius="4,4,0,0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
          <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
@@ -160,6 +169,31 @@
       </ControlTemplate.Triggers>
    </ControlTemplate>
 
+   <ControlTemplate x:Key="Button.NoBackgroundButton" TargetType="{x:Type Button}">
+      <Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+         <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsDefaulted" Value="true">
+            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+         </Trigger>
+         <Trigger Property="IsMouseOver" Value="true">
+            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.NoBackground.MouseOver.Background}"/>
+            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.NoBackground.MouseOver.Border}"/>
+         </Trigger>
+         <Trigger Property="IsPressed" Value="true">
+            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.NoBackground.Pressed.Background}"/>
+            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.NoBackground.Pressed.Border}"/>
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.NoBackground.Disabled.Background}"/>
+            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.NoBackground.Disabled.Border}"/>
+            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.NoBackground.Disabled.Foreground}"/>
+            <Setter Property="OpacityMask" Value="#54707070"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
    <Style TargetType="{x:Type Button}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
       <Setter Property="Background" Value="White"/>
@@ -211,7 +245,7 @@
    <Style x:Key="ToolBar_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="White"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
    <Style x:Key="ToolBar_SmallButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
@@ -312,9 +346,23 @@
       <Setter Property="FontSize" Value="12"/>
    </Style>
 
+   <Style x:Key="BottomPanel_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Background">
+         <Setter.Value>
+            <SolidColorBrush Color="White" Opacity="0.01"/>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Template" Value="{StaticResource Button.NoBackgroundButton}"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- ToggleButton Style -->
+   <sys:Double x:Key="ToggleButton.Image.Height">NaN</sys:Double>
+   <sys:Double x:Key="ToggleButton.Image.Width">NaN</sys:Double>
 
    <Style TargetType="{x:Type ToggleButton}">
       <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
@@ -362,10 +410,40 @@
       </Setter>
    </Style>
 
+   <ControlTemplate x:Key="ToggleButton.NoBackgroundButton" TargetType="{x:Type ToggleButton}">
+      <Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+         <ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+      </Border>
+      <ControlTemplate.Triggers>
+         <Trigger Property="Button.IsDefaulted" Value="true">
+            <Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+         </Trigger>
+         <Trigger Property="IsMouseOver" Value="true">
+            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.NoBackground.MouseOver.Background}"/>
+            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.NoBackground.MouseOver.Border}"/>
+         </Trigger>
+         <Trigger Property="IsPressed" Value="true">
+            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.NoBackground.Pressed.Background}"/>
+            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.NoBackground.Pressed.Border}"/>
+         </Trigger>
+         <Trigger Property="IsChecked" Value="true">
+            <Setter Property="Background" TargetName="border" Value="{StaticResource Icarus_Gray}"/>
+            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
+            <!--<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.Pressed.Border}"/>-->
+         </Trigger>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Background" TargetName="border" Value="{StaticResource Button.NoBackground.Disabled.Background}"/>
+            <Setter Property="BorderBrush" TargetName="border" Value="{StaticResource Button.NoBackground.Disabled.Border}"/>
+            <Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{StaticResource Button.NoBackground.Disabled.Foreground}"/>
+            <Setter Property="OpacityMask" Value="#54707070"/>
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
    <Style x:Key="ToolBar_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
       <Setter Property="Height" Value="30"/>
       <Setter Property="Width" Value="30"/>
-      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Background" Value="White"/>
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
@@ -578,6 +656,18 @@
       <Setter Property="BorderThickness" Value="0"/>
    </Style>
 
+   <Style x:Key="BottomPanel_ToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="30"/>
+      <Setter Property="Background">
+         <Setter.Value>
+            <SolidColorBrush Color="White" Opacity="0.01"/>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Template" Value="{StaticResource ToggleButton.NoBackgroundButton}"/>
+   </Style>
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- TextBlock -->
@@ -627,7 +717,7 @@
    </Style>
 
    <Style x:Key="TopPanelFixed_TextBlock" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseTextBlock}">
-      <Setter Property="FontSize" Value="16"/>
+      <Setter Property="FontSize" Value="14"/>
       <Setter Property="VerticalAlignment" Value="Center"/>
    </Style>
 
@@ -727,6 +817,15 @@
    <Style x:Key="Button_Image" TargetType="{x:Type Image}">
       <Setter Property="Stretch" Value="Uniform" />
    </Style>
+   
+   <!--<Style x:Key="ToggleButton_ControlTemplate_Image" TargetType="{x:Type Image}">
+      <Setter Property="Stretch" Value="Uniform" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalAlignment" Value="{TemplateBinding HorizontalContentAlignment}" />
+      <Setter Property="Margin" Value="{TemplateBinding Padding}" />
+      <Setter Property="SnapsToDevicePixels" Value="{TemplateBinding SnapsToDevicePixels}" />
+      <Setter Property="VerticalAlignment" Value="{TemplateBinding VerticalContentAlignment}" />
+   </Style>-->
 
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
@@ -1150,11 +1249,11 @@
    <!-- Border -->
 
    <Style x:Key="DefaultBorder" TargetType="{x:Type Border}">
-      <Setter Property="BorderBrush" Value="#D5DFE5"/>
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="CornerRadius" Value="3"/>
-      <Setter Property="Padding" Value="3"/>
-      <Setter Property="Margin" Value="1"/>
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="False">
+            <Setter Property="OpacityMask" Value="#54707070"/>
+         </Trigger>
+      </Style.Triggers>
    </Style>
 
    <Style x:Key="Border" TargetType="{x:Type Border}">
@@ -1198,7 +1297,7 @@
       <Setter Property="Margin" Value="0,0,0,0"/>
    </Style>
 
-   <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}">
+   <Style x:Key="TopPanel_Border" TargetType="{x:Type Border}" BasedOn="{StaticResource DefaultBorder}">
       <Setter Property="Background" Value="White" />
       <Setter Property="BorderBrush" Value="White"/>
       <Setter Property="BorderThickness" Value="0"/>
@@ -1255,6 +1354,14 @@
       <Setter Property="Padding" Value="5"/>
    </Style>
 
+   <!--<Style x:Key="ToggleButton_ControlTemplate_Border" TargetType="Border">
+      <Setter Property="CornerRadius" Value="4"/>
+      <Setter Property="Background" Value="{TemplateBinding Background}"/>
+      <Setter Property="BorderBrush" Value="{TemplateBinding BorderBrush}"/>
+      <Setter Property="BorderThickness" Value="{TemplateBinding BorderThickness}"/>
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+   </Style>-->
+
    <!-- ______________________________________________________________________________________________________________________________________________ -->
 
    <!-- EgtCustomWindow -->
@@ -2568,284 +2675,6 @@
 
    <!-- Layer Slider -->
 
-   <!--<SolidColorBrush x:Key="SliderThumb.Static.Foreground" Color="#FFE5E5E5"/>
-   <SolidColorBrush x:Key="SliderThumb.MouseOver.Background" Color="#FFDCECFC"/>
-   <SolidColorBrush x:Key="SliderThumb.MouseOver.Border" Color="#FF7Eb4EA"/>
-   <SolidColorBrush x:Key="SliderThumb.Pressed.Background" Color="#FFDAECFC"/>
-   <SolidColorBrush x:Key="SliderThumb.Pressed.Border" Color="#FF569DE5"/>
-   <SolidColorBrush x:Key="SliderThumb.Disabled.Background" Color="#FFF0F0F0"/>
-   <SolidColorBrush x:Key="SliderThumb.Disabled.Border" Color="#FFD9D9D9"/>
-   <SolidColorBrush x:Key="SliderThumb.Static.Background" Color="#FFF0F0F0"/>
-   <SolidColorBrush x:Key="SliderThumb.Static.Border" Color="#FFACACAC"/>
-   <ControlTemplate x:Key="SliderThumbHorizontalTop" TargetType="{x:Type Thumb}">
-      <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-         <Path x:Name="grip" Data="M 0,6 C0,6 5.5,0 5.5,0 5.5,0 11,6 11,6 11,6 11,18 11,18 11,18 0,18 0,18 0,18 0,6 0,6 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" SnapsToDevicePixels="True" Stroke="{StaticResource SliderThumb.Static.Border}" StrokeThickness="1" UseLayoutRounding="True" VerticalAlignment="Center"/>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-         </Trigger>
-         <Trigger Property="IsDragging" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-         </Trigger>
-         <Trigger Property="IsEnabled" Value="false">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <ControlTemplate x:Key="SliderThumbHorizontalBottom" TargetType="{x:Type Thumb}">
-      <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-         <Path x:Name="grip" Data="M 0,12 C0,12 5.5,18 5.5,18 5.5,18 11,12 11,12 11,12 11,0 11,0 11,0 0,0 0,0 0,0 0,12 0,12 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" SnapsToDevicePixels="True" Stroke="{StaticResource SliderThumb.Static.Border}" StrokeThickness="1" UseLayoutRounding="True" VerticalAlignment="Center"/>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-         </Trigger>
-         <Trigger Property="IsDragging" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-         </Trigger>
-         <Trigger Property="IsEnabled" Value="false">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <SolidColorBrush x:Key="SliderThumb.Track.Border" Color="#FFD6D6D6"/>
-   <SolidColorBrush x:Key="SliderThumb.Track.Background" Color="#FFE7EAEA"/>
-   <Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
-      <Setter Property="OverridesDefaultStyle" Value="true"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="Focusable" Value="false"/>
-      <Setter Property="IsTabStop" Value="false"/>
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type RepeatButton}">
-               <Rectangle Fill="{TemplateBinding Background}" Height="{TemplateBinding Height}" Width="{TemplateBinding Width}"/>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-   <ControlTemplate x:Key="SliderThumbHorizontalDefault" TargetType="{x:Type Thumb}">
-      <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-         <Path x:Name="grip" Data="M 0,0 C0,0 11,0 11,0 11,0 11,18 11,18 11,18 0,18 0,18 0,18 0,0 0,0 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" SnapsToDevicePixels="True" Stroke="{StaticResource SliderThumb.Static.Border}" StrokeThickness="1" UseLayoutRounding="True" VerticalAlignment="Center"/>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-         </Trigger>
-         <Trigger Property="IsDragging" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-         </Trigger>
-         <Trigger Property="IsEnabled" Value="false">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <ControlTemplate x:Key="SliderHorizontal" TargetType="{x:Type Slider}">
-      <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,0,0,2" Placement="Top" Grid.Row="0" Visibility="Collapsed"/>
-            <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Margin="0,2,0,0" Placement="Bottom" Grid.Row="2" Visibility="Collapsed"/>
-            <Border x:Name="TrackBackground" BorderBrush="{StaticResource SliderThumb.Track.Border}" BorderThickness="1" Background="{StaticResource SliderThumb.Track.Background}" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
-               <Canvas Margin="-6,-1">
-                  <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Visibility="Hidden"/>
-               </Canvas>
-            </Border>
-            <Track x:Name="PART_Track" Grid.Row="1">
-               <Track.DecreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-               </Track.DecreaseRepeatButton>
-               <Track.IncreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-               </Track.IncreaseRepeatButton>
-               <Track.Thumb>
-                  <Thumb x:Name="Thumb" Focusable="False" Height="18" OverridesDefaultStyle="True" Template="{StaticResource SliderThumbHorizontalDefault}" VerticalAlignment="Center" Width="11"/>
-               </Track.Thumb>
-            </Track>
-         </Grid>
-      </Border>
-      <ControlTemplate.Triggers>
-         <Trigger Property="TickPlacement" Value="TopLeft">
-            <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-            <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbHorizontalTop}"/>
-            <Setter Property="Margin" TargetName="TrackBackground" Value="5,2,5,0"/>
-         </Trigger>
-         <Trigger Property="TickPlacement" Value="BottomRight">
-            <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-            <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbHorizontalBottom}"/>
-            <Setter Property="Margin" TargetName="TrackBackground" Value="5,0,5,2"/>
-         </Trigger>
-         <Trigger Property="TickPlacement" Value="Both">
-            <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-            <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-         </Trigger>
-         <Trigger Property="IsSelectionRangeEnabled" Value="true">
-            <Setter Property="Visibility" TargetName="PART_SelectionRange" Value="Visible"/>
-         </Trigger>
-         <Trigger Property="IsKeyboardFocused" Value="true">
-            <Setter Property="Foreground" TargetName="Thumb" Value="Blue"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <ControlTemplate x:Key="SliderThumbVerticalLeft" TargetType="{x:Type Thumb}">
-      <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-         <Path x:Name="grip" Data="M 6,11 C6,11 0,5.5 0,5.5 0,5.5 6,0 6,0 6,0 18,0 18,0 18,0 18,11 18,11 18,11 6,11 6,11 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" Stroke="{StaticResource SliderThumb.Static.Border}"/>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-         </Trigger>
-         <Trigger Property="IsDragging" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-         </Trigger>
-         <Trigger Property="IsEnabled" Value="false">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <ControlTemplate x:Key="SliderThumbVerticalRight" TargetType="{x:Type Thumb}">
-      <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-         <Path x:Name="grip" Data="M 12,11 C12,11 18,5.5 18,5.5 18,5.5 12,0 12,0 12,0 0,0 0,0 0,0 0,11 0,11 0,11 12,11 12,11 z" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" Stroke="{StaticResource SliderThumb.Static.Border}"/>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-         </Trigger>
-         <Trigger Property="IsDragging" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-         </Trigger>
-         <Trigger Property="IsEnabled" Value="false">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <ControlTemplate x:Key="SliderThumbVerticalDefault" TargetType="{x:Type Thumb}">
-      <Grid HorizontalAlignment="Right" VerticalAlignment="Top">
-         <Canvas>
-            <Grid Canvas.Top="-8" Canvas.Right="0" HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="10"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <Border Height="25"
-                          Padding="3,0"
-                          Style="{StaticResource RightPanel_Border}">
-                  <TextBlock HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Foreground="Black"
-                                Text="{Binding ShowValue, RelativeSource={RelativeSource AncestorType={x:Type Slider}}}"/>
-               </Border>
-               <Ellipse x:Name="grip" Grid.Column="2" Height="18" Width="18" Fill="{StaticResource SliderThumb.Static.Background}" Stretch="Fill" Stroke="{StaticResource SliderThumb.Static.Border}"/>
-            </Grid>
-         </Canvas>
-      </Grid>
-      <ControlTemplate.Triggers>
-         <Trigger Property="IsMouseOver" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.MouseOver.Border}"/>
-         </Trigger>
-         <Trigger Property="IsDragging" Value="true">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Pressed.Border}"/>
-         </Trigger>
-         <Trigger Property="IsEnabled" Value="false">
-            <Setter Property="Fill" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Background}"/>
-            <Setter Property="Stroke" TargetName="grip" Value="{StaticResource SliderThumb.Disabled.Border}"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <ControlTemplate x:Key="SliderVertical" TargetType="{x:Type Slider}">
-      <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="10"/>
-               <RowDefinition Height="1*"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock Grid.Column="1" 
-                          Foreground="Black"
-                          Text="{Binding ShowMaximum, RelativeSource={RelativeSource AncestorType={x:Type Slider}}}"/>
-            <TickBar x:Name="TopTick" Grid.Column="0" Grid.Row="2" Fill="{TemplateBinding Foreground}" Margin="0,0,2,0" Placement="Left" Visibility="Collapsed" Width="4"/>
-            <TickBar x:Name="BottomTick" Grid.Column="2" Grid.Row="2" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" Placement="Right" Visibility="Collapsed" Width="4"/>
-            <Border x:Name="TrackBackground" BorderBrush="{StaticResource SliderThumb.Track.Border}" BorderThickness="1" Background="{StaticResource SliderThumb.Track.Background}" Grid.Column="1" Grid.Row="2" HorizontalAlignment="center" Margin="0,5" Width="4.0">
-               <Canvas Margin="-1,-6">
-                  <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Visibility="Hidden" Width="4.0"/>
-               </Canvas>
-            </Border>
-            <Track x:Name="PART_Track" Grid.Column="1" Grid.Row="2">
-               <Track.DecreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-               </Track.DecreaseRepeatButton>
-               <Track.IncreaseRepeatButton>
-                  <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource RepeatButtonTransparent}"/>
-               </Track.IncreaseRepeatButton>
-               <Track.Thumb>
-                  <Thumb x:Name="Thumb" Focusable="False" Height="11" OverridesDefaultStyle="True" Template="{StaticResource SliderThumbVerticalDefault}" VerticalAlignment="Top" Width="18"/>
-               </Track.Thumb>
-            </Track>
-         </Grid>
-      </Border>
-      <ControlTemplate.Triggers>
-         <Trigger Property="TickPlacement" Value="TopLeft">
-            <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-            <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbVerticalLeft}"/>
-            <Setter Property="Margin" TargetName="TrackBackground" Value="2,5,0,5"/>
-         </Trigger>
-         <Trigger Property="TickPlacement" Value="BottomRight">
-            <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-            <Setter Property="Template" TargetName="Thumb" Value="{StaticResource SliderThumbVerticalRight}"/>
-            <Setter Property="Margin" TargetName="TrackBackground" Value="0,5,2,5"/>
-         </Trigger>
-         <Trigger Property="TickPlacement" Value="Both">
-            <Setter Property="Visibility" TargetName="TopTick" Value="Visible"/>
-            <Setter Property="Visibility" TargetName="BottomTick" Value="Visible"/>
-         </Trigger>
-         <Trigger Property="IsSelectionRangeEnabled" Value="true">
-            <Setter Property="Visibility" TargetName="PART_SelectionRange" Value="Visible"/>
-         </Trigger>
-         <Trigger Property="IsKeyboardFocused" Value="true">
-            <Setter Property="Foreground" TargetName="Thumb" Value="Blue"/>
-         </Trigger>
-      </ControlTemplate.Triggers>
-   </ControlTemplate>
-   <Style x:Key="LayerIndex_Slider" TargetType="{x:Type Slider}">
-      <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
-      <Setter Property="Background" Value="Transparent"/>
-      <Setter Property="BorderBrush" Value="Transparent"/>
-      <Setter Property="Foreground" Value="{StaticResource SliderThumb.Static.Foreground}"/>
-      <Setter Property="Template" Value="{StaticResource SliderHorizontal}"/>
-      <Style.Triggers>
-         <Trigger Property="Orientation" Value="Vertical">
-            <Setter Property="Template" Value="{StaticResource SliderVertical}"/>
-         </Trigger>
-      </Style.Triggers>
-   </Style>-->
-
    <Style x:Key="RepeatButtonTransparent" TargetType="{x:Type RepeatButton}">
       <Setter Property="OverridesDefaultStyle" Value="true"/>
       <Setter Property="Background" Value="Transparent"/>
@@ -2859,6 +2688,7 @@
          </Setter.Value>
       </Setter>
    </Style>
+   <sys:Double x:Key="SliderThumb.Thumb.Diameter">28</sys:Double>
    <SolidColorBrush x:Key="SliderThumb.Static.Background" Color="#2e5a81"/>
    <SolidColorBrush x:Key="SliderThumb.Static.Border" Color="#2e5a81"/>
    <SolidColorBrush x:Key="SliderThumb.Static.Foreground" Color="#92908d"/>
@@ -2893,7 +2723,8 @@
    <ControlTemplate x:Key="SliderThumbHorizontalTop" TargetType="{x:Type Thumb}">
       <Grid HorizontalAlignment="Center" UseLayoutRounding="True" VerticalAlignment="Center">
          <Ellipse x:Name="grip"
-                  Height="18" Width="18"
+                  Height="{StaticResource SliderThumb.Thumb.Diameter}"
+                  Width="{StaticResource SliderThumb.Thumb.Diameter}"
                   HorizontalAlignment="Center"
                   Fill="{StaticResource SliderThumb.Static.Background}"
                   Stroke="{StaticResource SliderThumb.Static.Border}"/>
@@ -2941,19 +2772,25 @@
          <Grid>
             <Grid VerticalAlignment="Stretch">
                <Grid.RowDefinitions>
-                  <RowDefinition Height="1*"/>
-                  <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
-                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="14*"/>
+                  <RowDefinition Height="8*" MinHeight="{TemplateBinding MinHeight}"/>
+                  <RowDefinition Height="14*"/>
                </Grid.RowDefinitions>
                <Border x:Name="TopTick_Border"
                        Background="{StaticResource SliderThumb.TickBar.Background}"
                        BorderThickness="0"
                        Visibility="Collapsed">
-                  <TickBar x:Name="TopTick" 
-                           Fill="{TemplateBinding Foreground}" 
-                           Height="4"
-                           Placement="Top" 
-                           Visibility="Collapsed"/>
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="1*"/>
+                        <RowDefinition Height="5*"/>
+                     </Grid.RowDefinitions>
+                     <TickBar x:Name="TopTick" 
+                              Grid.Row="1"
+                              Fill="{TemplateBinding Foreground}" 
+                              Placement="Top" 
+                              Visibility="Collapsed"/>
+                  </Grid>
                </Border>
                <Border x:Name="BottomTick_Border" 
                        Grid.Row="2"
@@ -2970,11 +2807,10 @@
                        Background="{StaticResource SliderThumb.Track.Background}"
                        BorderBrush="{StaticResource SliderThumb.Track.Border}"
                        BorderThickness="1"
-                       Height="4.0" 
                        Margin="0" 
                        Padding="0"
                        Grid.Row="1" 
-                       VerticalAlignment="Center">
+                       VerticalAlignment="Stretch">
                   <Canvas>
                      <Rectangle x:Name="PART_SelectionRange" 
                                 Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" 
@@ -2993,11 +2829,11 @@
                <Track.Thumb>
                   <Thumb x:Name="Thumb" 
                          Focusable="False" 
-                         Height="18" 
+                         Height="{StaticResource SliderThumb.Thumb.Diameter}"
+                         Width="{StaticResource SliderThumb.Thumb.Diameter}"
                          OverridesDefaultStyle="True" 
                          Template="{StaticResource SliderThumbHorizontalDefault}" 
-                         VerticalAlignment="Center"
-                         Width="18"/>
+                         VerticalAlignment="Center"/>
                </Track.Thumb>
             </Track>
          </Grid>
@@ -3089,7 +2925,8 @@
                <Ellipse Grid.Column="2" 
                         Grid.RowSpan="3"
                         x:Name="grip"
-                        Height="18" Width="18"
+                        Height="{StaticResource SliderThumb.Thumb.Diameter}"
+                        Width="{StaticResource SliderThumb.Thumb.Diameter}"
                         VerticalAlignment="Center"
                         Fill="{StaticResource SliderThumb.Static.Background}"
                         Stroke="{StaticResource SliderThumb.Static.Border}"/>
@@ -3143,19 +2980,25 @@
          <Grid>
             <Grid HorizontalAlignment="Stretch">
                <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="14*"/>
+                  <ColumnDefinition MinWidth="{TemplateBinding MinWidth}" Width="8*"/>
+                  <ColumnDefinition Width="14*"/>
                </Grid.ColumnDefinitions>
                <Border x:Name="TopTick_Border" 
                        Background="{StaticResource SliderThumb.TickBar.Background}"
                        BorderThickness="0"
                        Visibility="Collapsed">
-                  <TickBar x:Name="TopTick" 
-                           Fill="{TemplateBinding Foreground}" 
-                           Placement="Left" 
-                           Visibility="Collapsed"
-                           Width="4"/>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*"/>
+                        <ColumnDefinition Width="5*"/>
+                     </Grid.ColumnDefinitions>
+                     <TickBar x:Name="TopTick" 
+                              Grid.Column="1"
+                              Fill="{TemplateBinding Foreground}" 
+                              Placement="Left" 
+                              Visibility="Collapsed"/>
+                  </Grid>
                </Border>
                <Border x:Name="BottomTick_Border" 
                        Grid.Column="2"
@@ -3173,14 +3016,12 @@
                        BorderBrush="{StaticResource SliderThumb.Track.Border}" 
                        BorderThickness="1"
                        Grid.Column="1" 
-                       HorizontalAlignment="Center" 
-                       Width="4.0"
+                       HorizontalAlignment="Stretch" 
                        Margin="0" Padding="0">
                   <Canvas>
                      <Rectangle x:Name="PART_SelectionRange" 
                                 Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" 
-                                Visibility="Hidden" 
-                                Width="4.0"/>
+                                Visibility="Hidden"/>
                   </Canvas>
                </Border>
             </Grid>
@@ -3196,11 +3037,11 @@
                <Track.Thumb>
                   <Thumb x:Name="Thumb" 
                          Focusable="False" 
-                         Height="18"
+                         Height="{StaticResource SliderThumb.Thumb.Diameter}"
+                         Width="{StaticResource SliderThumb.Thumb.Diameter}"
                          OverridesDefaultStyle="True" 
                          Template="{StaticResource SliderThumbVerticalDefault}"
-                         VerticalAlignment="Top" 
-                         Width="18"/>
+                         VerticalAlignment="Top"/>
                </Track.Thumb>
             </Track>
          </Grid>
diff --git a/Icarus/ViewPanel/ViewPanelV.xaml b/Icarus/ViewPanel/ViewPanelV.xaml
index 4eaf7fc..1002559 100644
--- a/Icarus/ViewPanel/ViewPanelV.xaml
+++ b/Icarus/ViewPanel/ViewPanelV.xaml
@@ -6,50 +6,58 @@
    <Button ToolTip="{Binding ZoomAllToolTip}"
            Command="{Binding ZoomAllCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/ZoomAll.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/ZoomAll.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromTopToolTip}"
            Command="{Binding TopViewCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromTOP.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/LookFromTOP.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromFrontToolTip}"
            Command="{Binding FrontViewCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromFRONT.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/LookFromFRONT.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromRightToolTip}"
            Command="{Binding RightViewCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/LookFromRIGHT.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromBackToolTip}"
            Command="{Binding BackViewCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromBACK.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/LookFromBACK.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromLeftToolTip}"
            Command="{Binding LeftViewCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromLEFT.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/LookFromLEFT.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button ToolTip="{Binding LookFromIsoSWToolTip}"
            Command="{Binding IsoViewSWCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/LookFromISO_SW.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
    <Button ToolTip="{Binding ViewToCPlaneToolTip}" 
            Command="{Binding ViewToCPlaneCommand}"
            Margin="2.5,0,2.5,0"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ViewPanel/CplaneView.png" Stretch="Uniform"/>
+           Style="{StaticResource BottomPanel_Button}">
+      <Image Source="/Resources/ViewPanel/CplaneView.png"
+             Style="{StaticResource Button_Image}"/>
    </Button>
 
 </UniformGrid>