diff --git a/source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml b/source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml
index 275924a4..66ea7965 100644
--- a/source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/OverlayButtons.xaml
@@ -14,8 +14,8 @@
         Defines the height and width of the docking indicator buttons that are shown when
         documents or tool windows are dragged
     -->
-    <sys:Double x:Key="{x:Static reskeys:ResourceKeys.DockingButtonWidthKey}">48</sys:Double>
-    <sys:Double x:Key="{x:Static reskeys:ResourceKeys.DockingButtonHeightKey}">48</sys:Double>
+    <sys:Double x:Key="{x:Static reskeys:ResourceKeys.DockingButtonWidthKey}">40</sys:Double>
+    <sys:Double x:Key="{x:Static reskeys:ResourceKeys.DockingButtonHeightKey}">40</sys:Double>
 
     <!--  Left Dock Button pointing left  -->
     <Viewbox
diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
index 8fe84404..ead2066d 100644
--- a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
@@ -21,6 +21,7 @@
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/OverlayButtons.xaml" />
         <ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/Themes/Menu/MenuItem.xaml" />
+        <ResourceDictionary Source="/AvalonDock.Themes.VS2013;component/Themes/Icons/IconGeometry.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
@@ -643,15 +644,13 @@
                                 Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
                                 ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
                                 Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                                <Rectangle
+                                <Path
                                     x:Name="PART_ImgAutoHidePin"
                                     Width="13"
                                     Height="13"
-                                    Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}">
-                                    <Rectangle.OpacityMask>
-                                        <ImageBrush ImageSource="/AvalonDock.Themes.VS2013;component/Images/PinAutoHide.png" />
-                                    </Rectangle.OpacityMask>
-                                </Rectangle>
+                                    Data="{DynamicResource PinAutoHide}"
+                                    Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}"
+                                    Stretch="Uniform" />
                             </Button>
                             <Button
                                 x:Name="PART_HidePin"
@@ -663,15 +662,13 @@
                                 Style="{StaticResource AvalonDockThemeVs2013ButtonStyle}"
                                 ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
                                 Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-                                <Rectangle
+                                <Path
                                     x:Name="PART_ImgHidePin"
                                     Width="13"
                                     Height="13"
-                                    Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}">
-                                    <Rectangle.OpacityMask>
-                                        <ImageBrush ImageSource="/AvalonDock.Themes.VS2013;component/Images/PinClose.png" />
-                                    </Rectangle.OpacityMask>
-                                </Rectangle>
+                                    Data="{DynamicResource PinClose}"
+                                    Fill="{DynamicResource {x:Static reskeys:ResourceKeys.ToolWindowCaptionButtonInactiveGlyph}}"
+                                    Stretch="Uniform" />
                             </Button>
 
                         </Grid>
@@ -951,39 +948,15 @@
                                         <RowDefinition />
                                     </Grid.RowDefinitions>
 
-                                    <Border
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderThickness="0" />
-
-                                    <Border
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,2,2,0" />
-
-                                    <Border
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,2,0,2" />
-
-                                    <Border
+                                    <Path
                                         Grid.Row="1"
-                                        Grid.Column="2"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="0,2,2,2" />
-
-                                    <Border
-                                        Grid.Row="2"
                                         Grid.Column="1"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,0,2,2" />
+                                        Height="120"
+                                        Data="{DynamicResource DockPaneEmpty}"
+                                        Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
+                                        Stretch="Uniform"
+                                        Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
+                                        StrokeThickness="2" />
                                 </Grid>
 
                                 <!--  Inner 5 buttons of star shapped control  -->
@@ -1072,51 +1045,15 @@
 
                                 <!--  Gray Star Background  -->
                                 <Grid Grid.RowSpan="3" Grid.ColumnSpan="3">
-
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                    </Grid.ColumnDefinitions>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                        <RowDefinition />
-                                    </Grid.RowDefinitions>
-
-                                    <Border
+                                    <Path
                                         Grid.Row="1"
                                         Grid.Column="1"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderThickness="0" />
-
-                                    <Border
-                                        Grid.Row="0"
-                                        Grid.Column="1"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,2,2,0" />
-
-                                    <Border
-                                        Grid.Row="1"
-                                        Grid.Column="0"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,2,0,2" />
-
-                                    <Border
-                                        Grid.Row="1"
-                                        Grid.Column="2"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="0,2,2,2" />
-
-                                    <Border
-                                        Grid.Row="2"
-                                        Grid.Column="1"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,0,2,2" />
+                                        Height="120"
+                                        Data="{DynamicResource DockPaneEmpty}"
+                                        Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
+                                        Stretch="Uniform"
+                                        Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
+                                        StrokeThickness="2" />
                                 </Grid>
 
                                 <!--  Inner 5 buttons of star shapped control  -->
@@ -1224,43 +1161,17 @@
                                         <RowDefinition />
                                     </Grid.RowDefinitions>
 
-                                    <Border
-                                        Grid.Row="2"
-                                        Grid.Column="2"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderThickness="0" />
-
-                                    <Border
-                                        Grid.Row="0"
-                                        Grid.RowSpan="2"
-                                        Grid.Column="2"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,2,2,0" />
-
-                                    <Border
-                                        Grid.Row="2"
-                                        Grid.Column="0"
-                                        Grid.ColumnSpan="2"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,2,0,2" />
-
-                                    <Border
-                                        Grid.Row="2"
-                                        Grid.Column="3"
-                                        Grid.ColumnSpan="2"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="0,2,2,2" />
-
-                                    <Border
-                                        Grid.Row="3"
-                                        Grid.RowSpan="2"
-                                        Grid.Column="2"
-                                        Background="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
-                                        BorderBrush="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
-                                        BorderThickness="2,0,2,2" />
+                                    <Path
+                                        Grid.Row="1"
+                                        Grid.RowSpan="3"
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="3"
+                                        Width="210"
+                                        Data="{DynamicResource DockPaneLargeEmpty}"
+                                        Fill="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBackgroundBrushKey}}"
+                                        Stretch="Uniform"
+                                        Stroke="{DynamicResource {x:Static reskeys:ResourceKeys.DockingButtonStarBorderBrushKey}}"
+                                        StrokeThickness="2" />
                                 </Grid>
 
                                 <!--  Inner 5 buttons of star shapped control  -->
diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Icons/IconGeometry.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Icons/IconGeometry.xaml
new file mode 100644
index 00000000..7b302895
--- /dev/null
+++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Icons/IconGeometry.xaml
@@ -0,0 +1,12 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <PathGeometry x:Key="PinAutoHide" Figures="M 128,17.475L 130.842,17.475L 130.842,2.91001L 130.842,0.608195L 130.842,0.000223796L 139.593,0.000223796L 145.003,0.000223796L 145.424,0.000223796L 145.424,17.475L 148.413,17.475L 148.413,20.3848L 139.684,20.3848L 139.684,32.0003L 136.752,32.0003L 136.752,20.3848L 128,20.3848L 128,17.475 Z M 133.774,2.91007L 133.774,17.475L 139.593,17.475L 139.593,2.91007L 133.774,2.91007 Z" />
+    <PathGeometry x:Key="HTabGroup" Figures="M 2.53856,7.38456L 2.53856,12.3846L 31.9231,12.3846L 31.9231,7.38456L 2.53856,7.38456 Z M 0,0.000162761L 34.3846,0.000162761L 34.3846,14.7694L 0,14.7694L 0,0.000162761 Z M 2.53861,24.6155L 2.53861,29.6155L 31.9232,29.6155L 31.9232,24.6155L 2.53861,24.6155 Z M 5.00801e-005,17.2309L 34.3846,17.2309L 34.3846,32.0001L 5.00801e-005,32.0001L 5.00801e-005,17.2309 Z " />
+    <PathGeometry x:Key="VTabGroup" Figures="M 64,0.000223796L 101.319,0.000223796L 101.319,32.0002L 64,32.0002L 64,0.000223796 Z M 66.6804,8.03752L 66.6804,29.3154L 79.896,29.3154L 79.896,8.03752L 66.6804,8.03752 Z M 85.4232,8.03746L 85.4232,29.3154L 98.6388,29.3154L 98.6388,8.03746L 85.4232,8.03746 Z " />
+    <PathGeometry x:Key="DockPaneLargeEmpty" Figures="M 192,19.4161L 192,12.5843L 202.892,12.5843L 204.584,10.8924L 204.584,0.000223796L 211.416,0.000223796L 211.416,10.8924L 213.108,12.5843L 224,12.5843L 224,19.4161L 213.108,19.4161L 211.416,21.108L 211.416,32.0002L 204.584,32.0002L 204.584,21.108L 202.892,19.4161L 192,19.4161 Z " />
+    <PathGeometry x:Key="DockPaneEmpty" Figures="M 266.388,0.000223796L 277.612,0.000223796L 277.612,7.60856L 280.392,10.3883L 288,10.3883L 288,21.6122L 280.392,21.6122L 277.612,24.3919L 277.612,32.0002L 266.388,32.0002L 266.388,24.3919L 263.608,21.6122L 256,21.6122L 256,10.3883L 263.608,10.3883L 266.388,7.60856L 266.388,0.000223796 Z " />
+    <PathGeometry x:Key="PinMenu" Figures="1 M 352.041,32.0005L 320,0.000162761L 384,0.000162761L 352.041,32.0005 Z " />
+    <PathGeometry x:Key="PinClose" Figures="M 416,0.000101726L 424.115,0.000101726L 434.978,11.649L 445.84,0.000101726L 453.955,0.000101726L 439.035,16L 453.955,32.0001L 445.841,32.0001L 434.978,20.3509L 424.115,32.0001L 416,32.0001L 430.92,16L 416,0.000101726 Z " />
+    <PathGeometry x:Key="PinRestore" Figures="M 480,6.27958L 486.48,6.27958L 486.48,0.000101726L 512.201,0.000101726L 512.201,25.7207L 505.721,25.7207L 505.721,32.0001L 480,32.0001L 480,6.27958 Z M 505.721,6.27964L 505.721,22.5896L 508.852,22.5896L 508.852,3.29911L 489.561,3.29911L 489.561,6.27964L 505.721,6.27964 Z M 483.081,9.57847L 483.081,28.8689L 502.371,28.8689L 502.371,9.57847L 483.081,9.57847 Z " />
+    <PathGeometry x:Key="PinMaximize" Figures="M 544,4.06904e-005L 576,4.06904e-005L 576,32L 544,32L 544,4.06904e-005 Z M 547.2,3.20011L 547.2,28.8001L 572.8,28.8001L 572.8,3.20011L 547.2,3.20011 Z " />
+    <PathGeometry x:Key="PinDocMenu" Figures="M 608,0.000223796L 640,0.000223796L 640,7.70652L 608,7.70652L 608,0.000223796 Z M 624.021,32.0002L 608,16.0001L 640,16.0001L 624.021,32.0002 Z " />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/source/Components/AvalonDock/Properties/Resources.zh-Hans.resx b/source/Components/AvalonDock/Properties/Resources.zh-Hans.resx
index df0a5832..fea73fda 100644
--- a/source/Components/AvalonDock/Properties/Resources.zh-Hans.resx
+++ b/source/Components/AvalonDock/Properties/Resources.zh-Hans.resx
@@ -133,10 +133,10 @@
     <value>停靠</value>
   </data>
   <data name="Anchorable_DockAsDocument" xml:space="preserve">
-    <value>停靠成标签式文档</value>
+    <value>作为选项卡式停靠</value>
   </data>
   <data name="Anchorable_Float" xml:space="preserve">
-    <value>悬浮</value>
+    <value>浮动</value>
   </data>
   <data name="Anchorable_Hide" xml:space="preserve">
     <value>隐藏</value>
@@ -157,10 +157,10 @@
     <value>窗口位置</value>
   </data>
   <data name="Document_DockAsDocument" xml:space="preserve">
-    <value>停靠成标签式文档</value>
+    <value>作为选项卡式停靠</value>
   </data>
   <data name="Document_Float" xml:space="preserve">
-    <value>悬浮</value>
+    <value>浮动</value>
   </data>
   <data name="Document_MoveToNextTabGroup" xml:space="preserve">
     <value>移到下一标签组</value>