diff --git a/Fluent.Ribbon.Showcase/TestContent.xaml b/Fluent.Ribbon.Showcase/TestContent.xaml
index ce10c9cf9..53c382ae7 100644
--- a/Fluent.Ribbon.Showcase/TestContent.xaml
+++ b/Fluent.Ribbon.Showcase/TestContent.xaml
@@ -959,7 +959,7 @@
                 </Fluent:RibbonGroupBox>
 
                 <Fluent:RibbonGroupBox Header="Split buttons">
-                    <Fluent:SplitButton Header="Too many items"
+                    <Fluent:SplitButton Header="Too many items gggg"
                                         ResizeMode="Both"
                                         Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/Box.png"
                                         LargeIcon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Images/Box.png">
@@ -990,7 +990,7 @@
                         <MenuItem Header="25" />
                     </Fluent:SplitButton>
 
-                    <Fluent:DropDownButton Header="Dropdown (auto close on click)"
+                    <Fluent:DropDownButton Header="Dropdown (auto close on click) g"
                                            ResizeMode="Both"
                                            Icon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Icons/App.ico"
                                            LargeIcon="pack://application:,,,/Fluent.Ribbon.Showcase;component/Icons/App.ico"
diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/Button.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/Button.xaml
index b921cb8d8..f4f7e44a8 100644
--- a/Fluent.Ribbon/Themes/Office2010/Controls/Button.xaml
+++ b/Fluent.Ribbon/Themes/Office2010/Controls/Button.xaml
@@ -52,7 +52,7 @@
                                              Style="{DynamicResource TwoLineLabelStyle}"
                                              HorizontalAlignment="Stretch"
                                              VerticalAlignment="Center"
-                                             Margin="2,-1,2,2" />
+                                             Margin="2,-3,2,2" />
                     </StackPanel>
                 </Grid>
             </Border>
diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/DropDownButton.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/DropDownButton.xaml
index 7f9a602ca..df2e5a5ac 100644
--- a/Fluent.Ribbon/Themes/Office2010/Controls/DropDownButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2010/Controls/DropDownButton.xaml
@@ -94,7 +94,7 @@
                                                  Style="{DynamicResource TwoLineLabelStyle}"
                                                  HorizontalAlignment="Center"
                                                  VerticalAlignment="Center"
-                                                 Margin="2,-2,2,2"
+                                                 Margin="2,-4,2,2"
                                                  HasGlyph="{TemplateBinding HasTriangle}" />
                         </StackPanel>
                     </Grid>
diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/SplitButton.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/SplitButton.xaml
index c4f55ee48..d790a83fa 100644
--- a/Fluent.Ribbon/Themes/Office2010/Controls/SplitButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2010/Controls/SplitButton.xaml
@@ -77,17 +77,33 @@
                         </Rectangle>
                         <Border x:Name="downRect"
                                 VerticalAlignment="Bottom"
-                                Height="28"
+                                Height="29"
                                 Background="{DynamicResource TransparentBrush}"
                                 BorderThickness="0,1,0,0"
                                 Margin="-1,0" />
                         <Border x:Name="downRect_Copy"
                                 VerticalAlignment="Bottom"
-                                Height="27"
+                                Height="28"
                                 Background="{DynamicResource TransparentBrush}"
                                 BorderThickness="1"
                                 Margin="-1,1,-1,0"
                                 IsHitTestVisible="False" />
+                        <Fluent:ToggleButton x:Name="PART_Button"
+                                             Command="{TemplateBinding Command}"
+                                             CommandParameter="{TemplateBinding CommandParameter}"
+                                             CommandTarget="{TemplateBinding CommandTarget}"
+                                             Margin="-2,-2,-2,28"
+                                             Height="Auto"
+                                             Width="Auto"
+                                             Style="{DynamicResource InnerButtonStyle}"
+                                             LargeIcon="{Binding LargeIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
+                                             Icon="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
+                                             IsEnabled="{TemplateBinding IsButtonEnabled}"
+                                             Header="{TemplateBinding Header}"
+                                             ToolTip="{TemplateBinding ToolTip}"
+                                             IsChecked="{Binding IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                             IsDefinitive="{TemplateBinding IsDefinitive}"
+                                             CanAddToQuickAccessToolBar="{TemplateBinding CanAddButtonToQuickAccessToolBar}" />
                         <StackPanel x:Name="stackPanel"
                                     Width="Auto"
                                     Orientation="Vertical"
@@ -109,25 +125,9 @@
                                                  Style="{DynamicResource TwoLineLabelStyle}"
                                                  HorizontalAlignment="Center"
                                                  VerticalAlignment="Center"
-                                                 Margin="2,0,2,2"
+                                                 Margin="2,-4,2,2"
                                                  HasGlyph="{TemplateBinding HasTriangle}" />
-                        </StackPanel>
-                        <Fluent:ToggleButton x:Name="PART_Button"
-                                             Command="{TemplateBinding Command}"
-                                             CommandParameter="{TemplateBinding CommandParameter}"
-                                             CommandTarget="{TemplateBinding CommandTarget}"
-                                             Margin="-2,-2,-2,26"
-                                             Height="Auto"
-                                             Width="Auto"
-                                             Style="{DynamicResource InnerButtonStyle}"
-                                             LargeIcon="{Binding LargeIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
-                                             Icon="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
-                                             IsEnabled="{TemplateBinding IsButtonEnabled}"
-                                             Header="{TemplateBinding Header}"
-                                             ToolTip="{TemplateBinding ToolTip}"
-                                             IsChecked="{Binding IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                             IsDefinitive="{TemplateBinding IsDefinitive}"
-                                             CanAddToQuickAccessToolBar="{TemplateBinding CanAddButtonToQuickAccessToolBar}" />
+                        </StackPanel>                        
                     </Grid>
                 </Border>
             </Border>
@@ -382,9 +382,6 @@
                 <Setter Property="Height"
                         TargetName="downRect"
                         Value="Auto" />
-                <Setter Property="Style"
-                        TargetName="PART_Button"
-                        Value="{DynamicResource InnerButtonStyle}" />
                 <Setter Property="Margin"
                         TargetName="downRect"
                         Value="-1,-2,-1,-1" />
diff --git a/Fluent.Ribbon/Themes/Office2010/Controls/ToggleButton.xaml b/Fluent.Ribbon/Themes/Office2010/Controls/ToggleButton.xaml
index e33e57548..ec84e8f4b 100644
--- a/Fluent.Ribbon/Themes/Office2010/Controls/ToggleButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2010/Controls/ToggleButton.xaml
@@ -84,7 +84,7 @@
                                              Style="{DynamicResource TwoLineLabelStyle}"
                                              HorizontalAlignment="Stretch"
                                              VerticalAlignment="Stretch"
-                                             Margin="2,-2,2,2" />
+                                             Margin="2,-4,2,2" />
                     </StackPanel>
                 </Grid>
             </Border>
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
index eda382df1..65d49ba19 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
@@ -149,7 +149,7 @@
         <Setter Property="Template"
                 Value="{DynamicResource RibbonButtonControlTemplate}" />
         <Setter Property="Height"
-                Value="66" />
+                Value="68" />
         <Setter Property="Width"
                 Value="Auto" />
         <Setter Property="Foreground"
@@ -168,7 +168,7 @@
             <Trigger Property="Size"
                      Value="Large">
                 <Setter Property="Height"
-                        Value="66" />
+                        Value="68" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/ComboBox.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/ComboBox.xaml
index 9ffcd521f..7c231d9ce 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/ComboBox.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/ComboBox.xaml
@@ -17,7 +17,7 @@
         <Setter Property="Template"
                 Value="{DynamicResource RibbonComboButtonControlTemplate}" />
         <Setter Property="Height"
-                Value="66" />
+                Value="68" />
         <Setter Property="Width"
                 Value="Auto" />
         <Setter Property="Foreground"
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
index 32cfe0a38..13da567e4 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
@@ -10,7 +10,7 @@
         <Setter Property="Template"
                 Value="{DynamicResource RibbonDropDownButtonControlTemplate}" />
         <Setter Property="Height"
-                Value="66" />
+                Value="68" />
         <Setter Property="Width"
                 Value="Auto" />
         <Setter Property="Foreground"
@@ -21,7 +21,7 @@
             <Trigger Property="Size"
                      Value="Large">
                 <Setter Property="Height"
-                        Value="66" />
+                        Value="68" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/SplitButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/SplitButton.xaml
index a4d38eae8..7ca1b5895 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/SplitButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/SplitButton.xaml
@@ -9,7 +9,7 @@
         <Setter Property="Template"
                 Value="{DynamicResource RibbonSplitButtonControlTemplate}" />
         <Setter Property="Height"
-                Value="66" />
+                Value="68" />
         <Setter Property="Width"
                 Value="Auto" />
         <Setter Property="Foreground"
@@ -22,7 +22,7 @@
             <Trigger Property="Size"
                      Value="Large">
                 <Setter Property="Height"
-                        Value="66" />
+                        Value="68" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
index 943a558aa..fa8baf085 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
@@ -11,7 +11,7 @@
         <Setter Property="Template"
                 Value="{DynamicResource RibbonToggleButtonControlTemplate}" />
         <Setter Property="Height"
-                Value="66" />
+                Value="68" />
         <Setter Property="Width"
                 Value="Auto" />
         <Setter Property="Foreground"
@@ -22,7 +22,7 @@
             <Trigger Property="Size"
                      Value="Large">
                 <Setter Property="Height"
-                        Value="66" />
+                        Value="68" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
diff --git a/Fluent.Ribbon/Themes/Windows8/Controls/Button.xaml b/Fluent.Ribbon/Themes/Windows8/Controls/Button.xaml
index ced61f751..ec3d2f709 100644
--- a/Fluent.Ribbon/Themes/Windows8/Controls/Button.xaml
+++ b/Fluent.Ribbon/Themes/Windows8/Controls/Button.xaml
@@ -9,7 +9,7 @@
                      TargetType="{x:Type Fluent:Button}">
         <Border x:Name="border"
 				CornerRadius="{TemplateBinding CornerRadius}"
-                BorderThickness="{TemplateBinding BorderThickness}"
+				BorderThickness="{TemplateBinding BorderThickness}"
                 Background="{TemplateBinding Background}"
                 BorderBrush="{TemplateBinding BorderBrush}"
                 Height="Auto"
@@ -21,21 +21,21 @@
                             Orientation="Vertical"
                             d:LayoutOverrides="Width, Height">
                     <ContentPresenter x:Name="iconImage"
-                                        HorizontalAlignment="Center"
-                                        Height="32"
-                                        VerticalAlignment="Center"
-                                        Content="{Binding LargeIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
-                                        Width="32"
-                                        Margin="3,2"
-                                        SnapsToDevicePixels="True" />
+                                      HorizontalAlignment="Center"
+                                      Height="32"
+                                      VerticalAlignment="Center"
+                                      Content="{Binding LargeIcon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}"
+                                      Width="32"
+                                      Margin="3,2,3,1"
+                                      SnapsToDevicePixels="True" />
                     <Fluent:TwoLineLabel x:Name="controlLabel"
-                                            Text="{TemplateBinding Header}"
-                                            Style="{DynamicResource TwoLineLabelStyle}"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Center"
-                                            Margin="2,0,2,0" />
+                                         Text="{TemplateBinding Header}"
+                                         Style="{DynamicResource TwoLineLabelStyle}"
+                                         HorizontalAlignment="Stretch"
+                                         VerticalAlignment="Center"
+                                         Margin="2,-1,2,0" />
                 </StackPanel>
-            </Grid>            
+            </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="Size"
@@ -63,7 +63,7 @@
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,0" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Middle">
@@ -81,7 +81,7 @@
                         Value="False" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
-                        Value="2,-1,2,1" />
+                        Value="2,0,2,0" />
                 <Setter Property="VerticalAlignment"
                         TargetName="border"
                         Value="Stretch" />
@@ -143,7 +143,7 @@
             </MultiTrigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-
+    
     <Style x:Key="RibbonButtonStyle"
            TargetType="{x:Type Fluent:Button}">
         <Setter Property="Template"
diff --git a/Fluent.Ribbon/Themes/Windows8/Controls/DropDownButton.xaml b/Fluent.Ribbon/Themes/Windows8/Controls/DropDownButton.xaml
index 8c385781e..b49cb3b3c 100644
--- a/Fluent.Ribbon/Themes/Windows8/Controls/DropDownButton.xaml
+++ b/Fluent.Ribbon/Themes/Windows8/Controls/DropDownButton.xaml
@@ -74,7 +74,7 @@
                                                 Style="{DynamicResource TwoLineLabelStyle}"
                                                 HorizontalAlignment="Center"
                                                 VerticalAlignment="Center"
-                                                Margin="2,0,2,0"
+                                                Margin="2,-2,2,0"
                                                 HasGlyph="{TemplateBinding HasTriangle}" />
                     </StackPanel>
                 </Grid>
diff --git a/Fluent.Ribbon/Themes/Windows8/Controls/SplitButton.xaml b/Fluent.Ribbon/Themes/Windows8/Controls/SplitButton.xaml
index ff62a5c52..13ed2136b 100644
--- a/Fluent.Ribbon/Themes/Windows8/Controls/SplitButton.xaml
+++ b/Fluent.Ribbon/Themes/Windows8/Controls/SplitButton.xaml
@@ -73,18 +73,13 @@
                             BorderBrush="{DynamicResource TransparentBrush}"
                             Background="{DynamicResource TransparentBrush}"
                             Margin="0,0,0,0">
-                        <Grid>
-                            <Fluent:TwoLineLabel x:Name="controlLabel"
-                                                 Text="{TemplateBinding Header}"
-                                                 Style="{DynamicResource TwoLineLabelStyle}"
-                                                 HorizontalAlignment="Center"
-                                                 VerticalAlignment="Center"
-                                                 Margin="2,-1,2,0"
-                                                 HasGlyph="{TemplateBinding HasTriangle}" />
-                            <!--<ContentPresenter x:Name="iconImage" HorizontalAlignment="Center" 
-                                                VerticalAlignment="Center" MinWidth="10" Margin="3,2" SnapsToDevicePixels="True"
-                                                IsHitTestVisible="false" Visibility="Hidden" />-->
-                        </Grid>
+                        <Fluent:TwoLineLabel x:Name="controlLabel"
+                                             Text="{TemplateBinding Header}"
+                                             Style="{DynamicResource TwoLineLabelStyle}"
+                                             HorizontalAlignment="Center"
+                                             VerticalAlignment="Center"
+                                             Margin="2,-3,2,0"
+                                             HasGlyph="{TemplateBinding HasTriangle}" />
                     </Border>
                 </StackPanel>
             </Border>
diff --git a/Fluent.Ribbon/Themes/Windows8/Controls/ToggleButton.xaml b/Fluent.Ribbon/Themes/Windows8/Controls/ToggleButton.xaml
index db2fd096b..91b0b5208 100644
--- a/Fluent.Ribbon/Themes/Windows8/Controls/ToggleButton.xaml
+++ b/Fluent.Ribbon/Themes/Windows8/Controls/ToggleButton.xaml
@@ -64,7 +64,7 @@
                                             Style="{DynamicResource TwoLineLabelStyle}"
                                             HorizontalAlignment="Stretch"
                                             VerticalAlignment="Stretch"
-                                            Margin="2,0,2,0" />
+                                            Margin="2,-2,2,0" />
                 </StackPanel>
             </Grid>
         </Border>