From 2c539f1296ccdf3debcd1d51f1c2606a9541328b Mon Sep 17 00:00:00 2001
From: floele-sp <schmitz@winworker.de>
Date: Tue, 29 Mar 2016 14:34:22 +0200
Subject: [PATCH] Fixed icon alignment in DropDownButton, ToggleButton, Button
 (compared to SplitButton)

---
 Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml         | 4 ++--
 Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml | 4 ++--
 Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml   | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
index d3d88f03d..767138c14 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/Button.xaml
@@ -56,7 +56,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,2,0" />
+                        Value="2,0,2,0" />
                 <Setter Property="Content"
                         TargetName="iconImage"
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
@@ -92,7 +92,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,2,0" />
+                        Value="2,0,2,0" />
                 <Setter Property="Content"
                         TargetName="iconImage"
                         Value="{Binding Icon, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static Converters:StaticConverters.ObjectToImageConverter}}" />
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
index 13da567e4..b98027e03 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/DropDownButton.xaml
@@ -214,7 +214,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,0,0" />
+                        Value="2,0,0,0" />
                 <Setter Property="Margin"
                         TargetName="controlLabel"
                         Value="-2,0,2,1" />
@@ -256,7 +256,7 @@
                         Value="16" />
                 <Setter Property="Margin"
                         TargetName="iconImage"
-                        Value="1,0,2,0" />
+                        Value="2,0,2,0" />
                 <Setter Property="VerticalAlignment"
                         TargetName="controlLabel"
                         Value="Center" />
diff --git a/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml b/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
index fa8baf085..ec4f613eb 100644
--- a/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
+++ b/Fluent.Ribbon/Themes/Office2013/Controls/ToggleButton.xaml
@@ -28,6 +28,8 @@
                      Value="Middle">
                 <Setter Property="Height"
                         Value="22" />
+                <Setter Property="HorizontalAlignment"
+                        Value="Left" />
             </Trigger>
             <Trigger Property="Size"
                      Value="Small">
@@ -35,6 +37,8 @@
                         Value="22" />
                 <Setter Property="Width"
                         Value="22" />
+                <Setter Property="HorizontalAlignment"
+                        Value="Left" />
             </Trigger>
         </Style.Triggers>
     </Style>