From 0dd61b71ec33c566ddcdf0fcb3aa2ec177b67399 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Thu, 31 Jan 2019 01:44:23 +0200
Subject: [PATCH] [Material] + [Android, iOS] Refactored and fixed lots of
 button layout issues (#4967)

* [Android] Refactored and fixed lots of button layout issues
 - All text, image and content layout logic has been extracted into a separate manager
 - Fixed the issue buttons with just an image changing size
 - Fixed a few button padding issues (still needs another look)
 - Fixed the issue with the content layout changes not updating the actual button layout
 - Fixed image positioning for all (not legacy) buttons
 - Material button no longer uses material image layout as it overrides the custom positioning
 - Fixed a few other issues where properties don't change the native button, or layouts break the positioning of the image

* [Button] Fixed a whole bunch of issues
 - added a platform specific "BorderAdjustsPadding" to Android and iOS to prevent border overlap
 - added a new gallery with all sorts of buttons
 - improvements to the Android button layout manager
 - fixed to the Android button measure/layout process

* [Android] [Button] The preservation of default padding is now a flag

* [iOS] [Button] Extracted all the layout logic for the classic button
 - yet to update Material button to use this
 - fixed a few issues with the iOS layout
    - content layout changes were not updating the control
    - top/bottom did not respect spacing
    - the native control trimmed text in the getter, so use the value from the element

* Removing the platform specifics as they were the wrong property
 - the property is part of the renderer implementation
 - Material button on iOS still needs implementing

* Updated the material button to use the layout manager
 - the iOS layout logic needs some more investigation

* remove old comments

* A fix for when there is no text and some backwards compatibility

* Added a more realistic set of values

* Restrict the material button border to 1px. See #4951.

* Fixed that issue with the buttons and the padding...
 - Removed the inset so that layout is accurate
 - set the padding to 8dp to match that of iOS and Material
 - set the minimum height to 36 according to Material (it was 48dp, with 12dp total inset, and, 48-12=36)

* Update Xamarin.Forms.Core/Button.cs

Co-Authored-By: mattleibow <mattleibow@live.com>

* Don't add members to the public type

* [Material] Added a button to change text size in the demo page

* appcompat regression fixes

* move state checks around

* fix bad merge

* adding delay to ui tests
---
 .../Bugzilla39821.cs                               |   2 +-
 .../Bugzilla41415.cs                               |   4 +-
 .../Issue2482.cs                                   |   2 +-
 Xamarin.Forms.Controls/CoreGallery.cs              |   4 +
 .../ButtonBorderBackgroundGalleryPage.xaml         | 101 ++++++
 .../ButtonBorderBackgroundGalleryPage.xaml.cs      |  56 ++++
 .../GalleryPages/ButtonLayoutGalleryPage.xaml      | 129 ++++++++
 .../GalleryPages/ButtonLayoutGalleryPage.xaml.cs   | 195 ++++++++++++
 Xamarin.Forms.Controls/ThicknessConverter.cs       |  36 +++
 Xamarin.Forms.Core/Button.cs                       |   3 +-
 Xamarin.Forms.Core/Thickness.cs                    |   2 +-
 Xamarin.Forms.Core/VisualElement.cs                |   2 +-
 .../MaterialButtonRenderer.cs                      | 199 +++---------
 .../AppCompat/ButtonRenderer.cs                    | 228 ++-----------
 .../{FastRenderers => }/ButtonElementManager.cs    |  18 +-
 .../ButtonLayoutManager.cs                         | 301 ++++++++++++++++++
 Xamarin.Forms.Platform.Android/Extensions.cs       |   4 +
 .../FastRenderers/ButtonRenderer.cs                | 198 +++---------
 .../IButtonLayoutRenderer.cs                       |  12 +
 .../Material/MaterialButtonRenderer.cs             | 187 ++---------
 .../Resources/values/styles.xml                    |   7 +-
 .../Xamarin.Forms.Platform.Android.csproj          |   4 +-
 .../Extensions/Extensions.cs                       |   4 +
 .../Renderers/ButtonLayoutManager.cs               | 353 +++++++++++++++++++++
 .../Renderers/ButtonRenderer.cs                    | 167 ++--------
 .../Renderers/IButtonLayoutRenderer.cs             |  14 +
 .../Xamarin.Forms.Platform.iOS.csproj              |   2 +
 27 files changed, 1406 insertions(+), 828 deletions(-)
 create mode 100644 Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml
 create mode 100644 Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs
 create mode 100644 Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
 create mode 100644 Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
 create mode 100644 Xamarin.Forms.Controls/ThicknessConverter.cs
 rename Xamarin.Forms.Platform.Android/{FastRenderers => }/ButtonElementManager.cs (66%)
 create mode 100644 Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs
 create mode 100644 Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs
 create mode 100644 Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs
 create mode 100644 Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs
index 443eff1..58bca78 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs
@@ -123,7 +123,7 @@ namespace Xamarin.Forms.Controls.Issues
 		public void DoesNotCrash()
 		{
 			RunningApp.Tap(q => q.Marked("Animate"));
-			RunningApp.WaitForElement(q => q.Marked("Success"));
+			RunningApp.WaitForElement(q => q.Marked("Success"), timeout:TimeSpan.FromSeconds(25));
 		}
 #endif
 	}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs
index a8c8f03..978292b 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs
@@ -102,12 +102,12 @@ namespace Xamarin.Forms.Controls.Issues
 			RunningApp.Tap(q => q.Marked(ButtonText));
 			RunningApp.WaitForElement(q => q.Marked("x: 100"));
 			RunningApp.WaitForElement(q => q.Marked("y: 100"));
-			RunningApp.WaitForElement(q => q.Marked("z: True"));
+			RunningApp.WaitForElement(q => q.Marked("z: True"), timeout: TimeSpan.FromSeconds(25));
 			RunningApp.WaitForElement(q => q.Marked("a: True"));
 			RunningApp.Tap(q => q.Marked(ButtonText));
 			RunningApp.WaitForElement(q => q.Marked("x: 200"));
 			RunningApp.WaitForElement(q => q.Marked("y: 100"));
-			RunningApp.WaitForElement(q => q.Marked("z: True"));
+			RunningApp.WaitForElement(q => q.Marked("z: True"), timeout: TimeSpan.FromSeconds(25));
 			RunningApp.WaitForElement(q => q.Marked("a: False"));
 		}
 
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs
index c98a3f4..71e01b9 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs
@@ -75,7 +75,7 @@ namespace Xamarin.Forms.Controls.Issues
 		{
 			RunningApp.WaitForElement(ButtonId);
 			RunningApp.DoubleTap(ButtonId);
-			RunningApp.WaitForElement(Success);
+			RunningApp.WaitForElement(Success, timeout: TimeSpan.FromSeconds(25));
 		}
 #endif
 	}
diff --git a/Xamarin.Forms.Controls/CoreGallery.cs b/Xamarin.Forms.Controls/CoreGallery.cs
index 2e28552..f0edad6 100644
--- a/Xamarin.Forms.Controls/CoreGallery.cs
+++ b/Xamarin.Forms.Controls/CoreGallery.cs
@@ -306,6 +306,10 @@ namespace Xamarin.Forms.Controls
 				new GalleryPageFactory(() => new ContextActionsGallery (tableView: true), "ContextActions Table Gallery"),
 				new GalleryPageFactory(() => new CoreBoxViewGalleryPage(), "BoxView Gallery"),
 				new GalleryPageFactory(() => new ButtonCoreGalleryPage(), "Button Gallery"),
+				new GalleryPageFactory(() => new ButtonLayoutGalleryPage(), "Button Layout Gallery"),
+				new GalleryPageFactory(() => new ButtonLayoutGalleryPage(VisualMarker.Material), "Button Layout Gallery (Material)"),
+				new GalleryPageFactory(() => new ButtonBorderBackgroundGalleryPage(), "Button Border & Background Gallery"),
+				new GalleryPageFactory(() => new ButtonBorderBackgroundGalleryPage(VisualMarker.Material), "Button Border & Background Gallery (Material)"),
 				new GalleryPageFactory(() => new DatePickerCoreGalleryPage(), "DatePicker Gallery"),
 				new GalleryPageFactory(() => new EditorCoreGalleryPage(), "Editor Gallery"),
 				new GalleryPageFactory(() => new FrameCoreGalleryPage(), "Frame Gallery"),
diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml b/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml
new file mode 100644
index 0000000..b0bf156
--- /dev/null
+++ b/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml
@@ -0,0 +1,101 @@
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:local="clr-namespace:Xamarin.Forms.Controls"
+			 xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
+			 xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
+			 x:Class="Xamarin.Forms.Controls.ButtonBorderBackgroundGalleryPage"
+			 Title="Button Border &amp; Background">
+
+	<ContentPage.Resources>
+		<ResourceDictionary>
+			<Style TargetType="Label">
+				<Setter Property="FontSize" Value="12" />
+			</Style>
+		</ResourceDictionary>
+	</ContentPage.Resources>
+
+	<ScrollView>
+		<StackLayout Padding="20" Spacing="10">
+
+			<Label Text="Base:" Margin="0,5,0,0" FontAttributes="Bold" />
+
+			<Label Text="Defaults:" Margin="0,0,0,-5" />
+			<StackLayout Padding="0" Spacing="5">
+				<Button Text="Button Text" />
+			</StackLayout>
+
+			<Label Text="Modified:" Margin="0,5,0,0" FontAttributes="Bold" />
+
+			<Label Text="Backgrounds: (various background colors)" Margin="0,0,0,-5" />
+			<StackLayout Padding="0" Spacing="5">
+				<Button Text="Transparent" BackgroundColor="Transparent" />
+				<Button Text="Red" BackgroundColor="Red" />
+				<Button Text="Black" BackgroundColor="Black" />
+				<Button Text="Red, Image" BackgroundColor="Red" Image="bank.png" />
+			</StackLayout>
+
+			<Label Text="Corners: (various corner radii)" Margin="0,0,0,-5" />
+			<StackLayout Padding="0" Spacing="5">
+				<Button Text="Radius: 0" CornerRadius="0" />
+				<Button Text="Radius: 5" CornerRadius="5" />
+				<Button Text="Radius: 15" CornerRadius="15" />
+				<Button Text="Radius: 15, Image" CornerRadius="15" Image="bank.png" />
+				<Button Text="Radius: 15, Width: 5" CornerRadius="15" BorderWidth="5" BorderColor="Red" />
+			</StackLayout>
+
+			<Label Text="Border Widths: (various border widths, red color)" Margin="0,0,0,-5" />
+			<StackLayout Padding="0" Spacing="5">
+				<Button Text="Width: 5, Color: &lt;none&gt;" BorderWidth="5" />
+				<Button Text="Width: 0" BorderWidth="0" BorderColor="Red" />
+				<Button Text="Width: 1" BorderWidth="1" BorderColor="Red" />
+				<Button Text="Width: 15" BorderWidth="15" BorderColor="Red" />
+				<Button Text="Width: 15, Image" BorderWidth="15" BorderColor="Red" Image="bank.png" />
+			</StackLayout>
+
+			<Label Text="Border Colors: (various border colors, width 5)" Margin="0,0,0,-5" />
+			<StackLayout Padding="0" Spacing="5">
+				<Button Text="Red, Width: &lt;none&gt;" BorderColor="Red" />
+				<Button Text="Transparent" BorderColor="Transparent" BorderWidth="5" />
+				<Button Text="Red" BorderColor="Red" BorderWidth="5" />
+				<Button Text="Black" BorderColor="Black" BorderWidth="5" />
+				<Button Text="Red, Image" BorderColor="Red" BorderWidth="5" Image="bank.png" />
+			</StackLayout>
+
+			<Label Text="Circles:" Margin="0,5,0,0" FontAttributes="Bold" />
+
+			<Label Text="Defaults: (no padding/shadow)" Margin="0,0,0,-5" />
+			<StackLayout Padding="0" Spacing="5">
+				<StackLayout Padding="0" Spacing="5" Orientation="Horizontal">
+					<Button Text="Square" WidthRequest="100" HeightRequest="100" />
+					<Button Text="Circle" CornerRadius="50" WidthRequest="100" HeightRequest="100" />
+				</StackLayout>
+				<StackLayout Padding="0" Spacing="5" Orientation="Horizontal">
+					<Button Text="Red Square" BackgroundColor="Red" WidthRequest="100" HeightRequest="100" />
+					<Button Text="Red Circle" BackgroundColor="Red" CornerRadius="50" WidthRequest="100" HeightRequest="100" />
+				</StackLayout>
+				<StackLayout Padding="0" Spacing="5" Orientation="Horizontal">
+					<Button Text="Image Square" BackgroundColor="Red" Image="bank.png" WidthRequest="100" HeightRequest="100" />
+					<Button Text="Image Circle" BackgroundColor="Red" CornerRadius="50" Image="bank.png" WidthRequest="100" HeightRequest="100" />
+				</StackLayout>
+			</StackLayout>
+
+			<Label Text="Specifics: (with padding/shadow)" Margin="0,0,0,-5" />
+			<StackLayout Padding="0" Spacing="5">
+				<StackLayout Padding="0" Spacing="5" Orientation="Horizontal">
+					<Button Text="Square" WidthRequest="100" HeightRequest="100" android:Button.UseDefaultPadding="true" android:Button.UseDefaultShadow="true" />
+					<Button Text="Circle" CornerRadius="50" WidthRequest="100" HeightRequest="100" android:Button.UseDefaultPadding="true" android:Button.UseDefaultShadow="true" />
+				</StackLayout>
+				<StackLayout Padding="0" Spacing="5" Orientation="Horizontal">
+					<Button Text="Red Square" BackgroundColor="Red" WidthRequest="100" HeightRequest="100" android:Button.UseDefaultPadding="true" android:Button.UseDefaultShadow="true" />
+					<Button Text="Red Circle" BackgroundColor="Red" CornerRadius="50" WidthRequest="100" HeightRequest="100" android:Button.UseDefaultPadding="true" android:Button.UseDefaultShadow="true" />
+				</StackLayout>
+				<StackLayout Padding="0" Spacing="5" Orientation="Horizontal">
+					<Button Text="Image Square" BackgroundColor="Red" Image="bank.png" WidthRequest="100" HeightRequest="100" android:Button.UseDefaultPadding="true" android:Button.UseDefaultShadow="true" />
+					<Button Text="Image Circle" BackgroundColor="Red" CornerRadius="50" Image="bank.png" WidthRequest="100" HeightRequest="100" android:Button.UseDefaultPadding="true" android:Button.UseDefaultShadow="true" />
+				</StackLayout>
+			</StackLayout>
+
+		</StackLayout>
+	</ScrollView>
+
+</ContentPage>
diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs b/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs
new file mode 100644
index 0000000..87b70fd
--- /dev/null
+++ b/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs
@@ -0,0 +1,56 @@
+using System;
+using Xamarin.Forms.Xaml;
+
+namespace Xamarin.Forms.Controls
+{
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ButtonBorderBackgroundGalleryPage : ContentPage
+	{
+		public ButtonBorderBackgroundGalleryPage()
+			: this(VisualMarker.MatchParent)
+		{
+		}
+
+		public ButtonBorderBackgroundGalleryPage(IVisual visual)
+		{
+			InitializeComponent();
+			Visual = visual;
+
+			// buttons are transparent on default iOS, so we have to give them something
+			if (Device.RuntimePlatform == Device.iOS)
+			{
+				if (Visual != VisualMarker.Material)
+				{
+					SetBackground(Content);
+
+					void SetBackground(View view)
+					{
+						if (view is Button button && !button.IsSet(Button.BackgroundColorProperty))
+							view.BackgroundColor = Color.LightGray;
+
+						if (view is Layout layout)
+						{
+							foreach (var child in layout.Children)
+							{
+								if (child is View childView)
+									SetBackground(childView);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		void HandleChecks_Clicked(object sender, System.EventArgs e)
+		{
+			var thisButton = sender as Button;
+			var layout = thisButton.Parent as Layout;
+			foreach (var child in layout.Children)
+			{
+				var button = child as Button;
+
+				Console.WriteLine($"{button.Text} => {button.Bounds}");
+			}
+		}
+	}
+}
diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
new file mode 100644
index 0000000..51ec220
--- /dev/null
+++ b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
@@ -0,0 +1,129 @@
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+			 xmlns:local="clr-namespace:Xamarin.Forms.Controls"
+			 x:Class="Xamarin.Forms.Controls.ButtonLayoutGalleryPage"
+			 Title="Button Layout">
+
+	<ContentPage.Resources>
+		<ResourceDictionary>
+			<local:ThicknessConverter x:Key="ThicknessConverter" />
+			<Style TargetType="Label">
+				<Setter Property="FontSize" Value="12" />
+			</Style>
+		</ResourceDictionary>
+	</ContentPage.Resources>
+
+	<ScrollView>
+		<StackLayout Padding="20" Spacing="10">
+
+			<Label Text="Buttons:" Margin="0,5,0,0" FontAttributes="Bold" />
+
+			<Label Text="Defaults:" Margin="0,0,0,-5" />
+			<StackLayout Orientation="Vertical" Padding="0" Spacing="5">
+				<Button />
+				<Button Text="Some Text" />
+				<Button Image="bank.png" />
+				<Button Text="Some Text" Image="bank.png" />
+			</StackLayout>
+
+			<Label Text="Autosized:" Margin="0,0,0,-5" />
+			<StackLayout Orientation="Horizontal" Padding="0" Spacing="5">
+				<Button x:Name="autosizedButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}" />
+			</StackLayout>
+
+			<Label Text="Explicit Size:" Margin="0,0,0,-5" />
+			<Grid Padding="0" RowSpacing="5" ColumnSpacing="5">
+				<Grid.RowDefinitions>
+					<RowDefinition Height="*" />
+					<RowDefinition Height="*" />
+				</Grid.RowDefinitions>
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="*" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+
+				<Button
+					x:Name="explicitButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
+					WidthRequest="120" HeightRequest="60" HorizontalOptions="Start" VerticalOptions="Start" />
+				<Button
+					x:Name="explicitWidthButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
+					Grid.Column="1" Grid.RowSpan="2" WidthRequest="120" HorizontalOptions="Start" VerticalOptions="Start" />
+				<Button
+					x:Name="explicitHeightButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}"
+					Grid.Row="1" Grid.ColumnSpan="2" HeightRequest="60" HorizontalOptions="Start" VerticalOptions="Start" />
+			</Grid>
+
+			<Label Text="Stretched:" Margin="0,0,0,-5" />
+			<StackLayout Orientation="Vertical" Padding="0" Spacing="5">
+				<Button x:Name="stretchedButton" Text="{Binding ButtonText}" Image="{Binding ButtonImage}" Padding="{Binding ButtonPadding}" ContentLayout="{Binding ButtonImageLayout}" FontSize="{Binding ButtonFontSize}" />
+			</StackLayout>
+
+			<Label Text="Options:" Margin="0,5,0,0" FontAttributes="Bold" />
+
+			<StackLayout Orientation="Horizontal" Padding="0" Spacing="5" HorizontalOptions="FillAndExpand">
+
+				<StackLayout Orientation="Vertical" Padding="0" Spacing="0" HorizontalOptions="FillAndExpand">
+					<Label Text="Text:" />
+					<Entry Text="{Binding ButtonText}" HorizontalOptions="FillAndExpand" />
+				</StackLayout>
+
+				<StackLayout Orientation="Vertical" Padding="0" Spacing="0">
+					<Label Text="Text Size:" />
+					<StackLayout Orientation="Horizontal" Padding="0" Spacing="5">
+						<Stepper Minimum="-1" Maximum="100" Value="{Binding ButtonFontSize}" VerticalOptions="Center" HorizontalOptions="FillAndExpand" />
+						<Label Text="{Binding ButtonFontSize}" VerticalOptions="Center" />
+					</StackLayout>
+				</StackLayout>
+
+			</StackLayout>
+
+			<StackLayout Orientation="Horizontal" Padding="0" Spacing="5" HorizontalOptions="FillAndExpand">
+
+				<StackLayout Orientation="Vertical" Padding="0" Spacing="0" HorizontalOptions="FillAndExpand">
+					<Label Text="Image:" />
+					<Picker ItemsSource="{Binding ButtonImages}" SelectedItem="{Binding ButtonImage}" HorizontalOptions="FillAndExpand" />
+				</StackLayout>
+
+			</StackLayout>
+
+			<StackLayout Orientation="Horizontal" Padding="0" Spacing="5" HorizontalOptions="FillAndExpand">
+
+				<StackLayout Orientation="Vertical" Padding="0" Spacing="0" HorizontalOptions="FillAndExpand">
+					<Label Text="Content Position:" />
+					<Picker ItemsSource="{Binding ButtonImagePositions}" SelectedItem="{Binding ButtonImagePosition}" HorizontalOptions="FillAndExpand" />
+				</StackLayout>
+
+				<StackLayout Orientation="Vertical" Padding="0" Spacing="0">
+					<Label Text="Content Spacing:" />
+					<StackLayout Orientation="Horizontal" Padding="0" Spacing="5">
+						<Stepper Minimum="-100" Maximum="100" Value="{Binding ButtonImageSpacing}" VerticalOptions="Center" HorizontalOptions="FillAndExpand" />
+						<Label Text="{Binding ButtonImageSpacing}" VerticalOptions="Center" />
+					</StackLayout>
+				</StackLayout>
+
+			</StackLayout>
+
+			<StackLayout Orientation="Horizontal" Padding="0" Spacing="5" HorizontalOptions="FillAndExpand">
+
+				<StackLayout Orientation="Vertical" Padding="0" Spacing="0" HorizontalOptions="FillAndExpand">
+					<Label Text="Padding:" />
+					<Entry Text="{Binding ButtonPadding, Converter={StaticResource ThicknessConverter}, Mode=OneWayToSource, TargetNullValue='0, 0, 0, 0'}" HorizontalOptions="FillAndExpand" />
+				</StackLayout>
+
+				<StackLayout Orientation="Vertical" Padding="0" Spacing="0">
+					<Label Text="Border Width:" />
+					<StackLayout Orientation="Horizontal" Padding="0" Spacing="5">
+						<Stepper Minimum="-1" Maximum="100" Value="{Binding ButtonBorderWidth}" VerticalOptions="Center" HorizontalOptions="FillAndExpand" />
+						<Label Text="{Binding ButtonBorderWidth}" VerticalOptions="Center" />
+					</StackLayout>
+				</StackLayout>
+
+			</StackLayout>
+
+			<Label Text="Use Default Shadow/Padding: (Android only)" Margin="0,0,0,-5" />
+			<Picker ItemsSource="{Binding ButtonFlags}" SelectedIndexChanged="OnButtonDefaultShadowChanged" />
+
+		</StackLayout>
+	</ScrollView>
+
+</ContentPage>
diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
new file mode 100644
index 0000000..1bac86c
--- /dev/null
+++ b/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
@@ -0,0 +1,195 @@
+using System;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.PlatformConfiguration;
+using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+using Xamarin.Forms.Xaml;
+using AndroidSpecific = Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
+using iOSSpecific = Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+using ButtonImagePosition = Xamarin.Forms.Button.ButtonContentLayout.ImagePosition;
+
+namespace Xamarin.Forms.Controls
+{
+	[Preserve(AllMembers = true)]
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+	public partial class ButtonLayoutGalleryPage : ContentPage
+	{
+		string _buttonText = "Text";
+		string _buttonImage = "bank.png";
+
+		Thickness _buttonPadding = default(Thickness);
+
+		double _buttonFontSize = -1.0;
+
+		double _buttonImageSpacing = 10;
+		double _buttonBorderWidth = -1;
+		ButtonImagePosition _buttonImagePosition = ButtonImagePosition.Left;
+
+		Button[] _buttons;
+
+		public ButtonLayoutGalleryPage()
+			: this(VisualMarker.MatchParent)
+		{
+		}
+
+		public ButtonLayoutGalleryPage(IVisual visual)
+		{
+			InitializeComponent();
+			Visual = visual;
+
+			_buttonFontSize = Device.GetNamedSize(NamedSize.Default, typeof(Button));
+
+			_buttons = new[]
+			{
+				autosizedButton,
+				explicitButton,
+				explicitWidthButton,
+				explicitHeightButton,
+				stretchedButton
+			};
+
+			// buttons are transparent on default iOS, so we have to give them something
+			if (Device.RuntimePlatform == Device.iOS)
+			{
+				if (Visual != VisualMarker.Material)
+				{
+					SetBackground(Content);
+
+					void SetBackground(View view)
+					{
+						if (view is Button button && !button.IsSet(Button.BackgroundColorProperty))
+							view.BackgroundColor = Color.LightGray;
+
+						if (view is Layout layout)
+						{
+							foreach (var child in layout.Children)
+							{
+								if (child is View childView)
+									SetBackground(childView);
+							}
+						}
+					}
+				}
+			}
+
+			BindingContext = this;
+		}
+
+		public string ButtonText
+		{
+			get => _buttonText;
+			set
+			{
+				_buttonText = value;
+				OnPropertyChanged();
+			}
+		}
+
+		public string[] ButtonImages =>
+			new string[] { "<none>", "bank.png", "oasissmall.jpg", "cover1.jpg" };
+
+		public string ButtonImage
+		{
+			get => _buttonImage;
+			set
+			{
+				_buttonImage = value;
+				OnPropertyChanged();
+			}
+		}
+
+		public Thickness ButtonPadding
+		{
+			get => _buttonPadding;
+			set
+			{
+				_buttonPadding = value;
+				OnPropertyChanged();
+			}
+		}
+
+		public double ButtonFontSize
+		{
+			get => _buttonFontSize;
+			set
+			{
+				_buttonFontSize = value;
+				OnPropertyChanged();
+			}
+		}
+
+		public double ButtonImageSpacing
+		{
+			get => _buttonImageSpacing;
+			set
+			{
+				_buttonImageSpacing = value;
+				OnPropertyChanged();
+				OnPropertyChanged(nameof(ButtonImageLayout));
+			}
+		}
+
+		public ButtonImagePosition[] ButtonImagePositions =>
+			(ButtonImagePosition[])Enum.GetValues(typeof(ButtonImagePosition));
+
+		public ButtonImagePosition ButtonImagePosition
+		{
+			get => _buttonImagePosition;
+			set
+			{
+				_buttonImagePosition = value;
+				OnPropertyChanged();
+				OnPropertyChanged(nameof(ButtonImageLayout));
+			}
+		}
+
+		public Button.ButtonContentLayout ButtonImageLayout =>
+			new Button.ButtonContentLayout(ButtonImagePosition, ButtonImageSpacing);
+
+		public string[] ButtonFlags =>
+			new[] { "<none>", "True", "False" };
+
+		public double ButtonBorderWidth
+		{
+			get => _buttonBorderWidth;
+			set
+			{
+				_buttonBorderWidth = value;
+				OnPropertyChanged();
+
+				foreach (var button in _buttons)
+				{
+					if (value != -1d)
+					{
+						button.BorderWidth = value;
+						button.BorderColor = Color.Red;
+					}
+					else
+					{
+						button.ClearValue(Button.BorderWidthProperty);
+						button.ClearValue(Button.BorderColorProperty);
+					}
+				}
+			}
+		}
+
+		void OnButtonDefaultShadowChanged(object sender, EventArgs e)
+		{
+			if (sender is Picker picker)
+			{
+				foreach (var button in _buttons)
+				{
+					if (picker.SelectedItem is string item && bool.TryParse(item, out var value))
+					{
+						button.On<Android>().SetUseDefaultShadow(value).SetUseDefaultPadding(value);
+					}
+					else
+					{
+						button.ClearValue(AndroidSpecific.Button.UseDefaultShadowProperty);
+						button.ClearValue(AndroidSpecific.Button.UseDefaultPaddingProperty);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/Xamarin.Forms.Controls/ThicknessConverter.cs b/Xamarin.Forms.Controls/ThicknessConverter.cs
new file mode 100644
index 0000000..8120ba1
--- /dev/null
+++ b/Xamarin.Forms.Controls/ThicknessConverter.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Globalization;
+
+namespace Xamarin.Forms.Controls
+{
+	public class ThicknessConverter : IValueConverter
+	{
+		ThicknessTypeConverter _converter = new ThicknessTypeConverter();
+
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is Thickness thickness)
+				return $"{thickness.Left}, {thickness.Top}, {thickness.Right}, {thickness.Bottom}";
+
+			return "0, 0, 0, 0";
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is Thickness thickness)
+				return thickness;
+
+			try
+			{
+				if (value is string str)
+					return _converter.ConvertFromInvariantString(str);
+			}
+			catch
+			{
+				// no-op
+			}
+
+			return default(Thickness);
+		}
+	}
+}
diff --git a/Xamarin.Forms.Core/Button.cs b/Xamarin.Forms.Core/Button.cs
index ffa8bed..6c75250 100644
--- a/Xamarin.Forms.Core/Button.cs
+++ b/Xamarin.Forms.Core/Button.cs
@@ -19,7 +19,8 @@ namespace Xamarin.Forms
 		public static readonly BindableProperty CommandParameterProperty = ButtonElement.CommandParameterProperty;
 
 		public static readonly BindableProperty ContentLayoutProperty =
-			BindableProperty.Create("ContentLayout", typeof(ButtonContentLayout), typeof(Button), new ButtonContentLayout(ButtonContentLayout.ImagePosition.Left, DefaultSpacing));
+			BindableProperty.Create(nameof(ContentLayout), typeof(ButtonContentLayout), typeof(Button), new ButtonContentLayout(ButtonContentLayout.ImagePosition.Left, DefaultSpacing),
+				propertyChanged: (bindable, oldVal, newVal) => ((Button)bindable).InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged));
 
 		public static readonly BindableProperty TextProperty = BindableProperty.Create("Text", typeof(string), typeof(Button), null,
 			propertyChanged: (bindable, oldVal, newVal) => ((Button)bindable).InvalidateMeasureInternal(InvalidationTrigger.MeasureChanged));
diff --git a/Xamarin.Forms.Core/Thickness.cs b/Xamarin.Forms.Core/Thickness.cs
index 21d5280..e670691 100644
--- a/Xamarin.Forms.Core/Thickness.cs
+++ b/Xamarin.Forms.Core/Thickness.cs
@@ -24,7 +24,7 @@ namespace Xamarin.Forms
 			get { return Top + Bottom; }
 		}
 
-		internal bool IsDefault
+		internal bool IsEmpty
 		{
 			get { return Left == 0 && Top == 0 && Right == 0 && Bottom == 0; }
 		}
diff --git a/Xamarin.Forms.Core/VisualElement.cs b/Xamarin.Forms.Core/VisualElement.cs
index f51dfd9..30e5f8f 100644
--- a/Xamarin.Forms.Core/VisualElement.cs
+++ b/Xamarin.Forms.Core/VisualElement.cs
@@ -713,7 +713,7 @@ namespace Xamarin.Forms
 
 			if (includeMargins)
 			{
-				if (!margin.IsDefault)
+				if (!margin.IsEmpty)
 				{
 					result.Minimum = new Size(result.Minimum.Width + margin.HorizontalThickness, result.Minimum.Height + margin.VerticalThickness);
 					result.Request = new Size(result.Request.Width + margin.HorizontalThickness, result.Request.Height + margin.VerticalThickness);
diff --git a/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs b/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs
index 34b697a..414f589 100644
--- a/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs
+++ b/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using CoreGraphics;
@@ -6,46 +6,57 @@ using Foundation;
 using MaterialComponents;
 using UIKit;
 using Xamarin.Forms;
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+using Specifics = Xamarin.Forms.PlatformConfiguration.iOSSpecific;
 using MButton = MaterialComponents.Button;
 
 namespace Xamarin.Forms.Platform.iOS.Material
 {
-	public class MaterialButtonRenderer : ViewRenderer<Button, MButton>
+	public class MaterialButtonRenderer : ViewRenderer<Button, MButton>, IImageVisualElementRenderer, IButtonLayoutRenderer
 	{
+		bool _isDisposed;
+
 		UIColor _defaultBorderColor;
 		nfloat _defaultBorderWidth = -1;
 
 		ButtonScheme _defaultButtonScheme;
 		ButtonScheme _buttonScheme;
 
-		bool _titleChanged;
-		CGSize _titleSize;
-		UIEdgeInsets _paddingDelta = new UIEdgeInsets();
+		ButtonLayoutManager _buttonLayoutManager;
 
 		public MaterialButtonRenderer()
 		{
 			VisualElement.VerifyVisualFlagEnabled();
+
+			_buttonLayoutManager = new ButtonLayoutManager(this,
+				preserveInitialPadding: true,
+				spacingAdjustsPadding: false,
+				borderAdjustsPadding: false,
+				collapseHorizontalPadding: true);
 		}
 
 		protected override void Dispose(bool disposing)
 		{
+			if (_isDisposed)
+				return;
+
 			if (Control != null)
 			{
 				Control.TouchUpInside -= OnButtonTouchUpInside;
 				Control.TouchDown -= OnButtonTouchDown;
+				_buttonLayoutManager?.Dispose();
+				_buttonLayoutManager = null;
 			}
 
+			_isDisposed = true;
+
 			base.Dispose(disposing);
 		}
 
 		public override CGSize SizeThatFits(CGSize size)
 		{
-			var result = base.SizeThatFits(size);
-
-			if (result.Height < _buttonScheme.MinimumHeight)
-				result.Height = _buttonScheme.MinimumHeight;
-
-			return result;
+			var measured = base.SizeThatFits(size);
+			return _buttonLayoutManager?.SizeThatFits(size, measured) ?? measured;
 		}
 
 		protected override void OnElementChanged(ElementChangedEventArgs<Button> e)
@@ -68,12 +79,11 @@ namespace Xamarin.Forms.Platform.iOS.Material
 					Control.TouchDown += OnButtonTouchDown;
 				}
 
-				UpdateText();
 				UpdateFont();
+				UpdateCornerRadius();
 				UpdateBorder();
-				UpdateImage();
 				UpdateTextColor();
-				UpdatePadding();
+				_buttonLayoutManager?.Update();
 
 				ApplyTheme();
 			}
@@ -104,11 +114,7 @@ namespace Xamarin.Forms.Platform.iOS.Material
 			base.OnElementPropertyChanged(sender, e);
 
 			var updatedTheme = false;
-			if (e.PropertyName == Button.TextProperty.PropertyName)
-			{
-				UpdateText();
-			}
-			else if (e.PropertyName == Button.TextColorProperty.PropertyName)
+			if (e.PropertyName == Button.TextColorProperty.PropertyName)
 			{
 				UpdateTextColor();
 				updatedTheme = true;
@@ -127,14 +133,6 @@ namespace Xamarin.Forms.Platform.iOS.Material
 				UpdateCornerRadius();
 				updatedTheme = true;
 			}
-			else if (e.PropertyName == Button.ImageProperty.PropertyName)
-			{
-				UpdateImage();
-			}
-			else if (e.PropertyName == Button.PaddingProperty.PropertyName)
-			{
-				UpdatePadding();
-			}
 
 			if (updatedTheme)
 				ApplyTheme();
@@ -209,6 +207,11 @@ namespace Xamarin.Forms.Platform.iOS.Material
 			if (_defaultBorderWidth == -1)
 				_defaultBorderWidth = Control.GetBorderWidth(UIControlState.Normal);
 
+			// TODO: The Material button does not support borders:
+			//       https://github.com/xamarin/Xamarin.Forms/issues/4951
+			if (borderWidth > 1)
+				borderWidth = 1;
+
 			if (borderWidth == (double)Button.BorderWidthProperty.DefaultValue)
 				Control.SetBorderWidth(_defaultBorderWidth, UIControlState.Normal);
 			else
@@ -220,9 +223,19 @@ namespace Xamarin.Forms.Platform.iOS.Material
 			int cornerRadius = Element.CornerRadius;
 
 			if (cornerRadius == (int)Button.CornerRadiusProperty.DefaultValue)
+			{
 				_buttonScheme.CornerRadius = _defaultButtonScheme.CornerRadius;
+			}
 			else
+			{
 				_buttonScheme.CornerRadius = cornerRadius;
+				if (_buttonScheme.ShapeScheme is ShapeScheme shapeScheme)
+				{
+					shapeScheme.SmallComponentShape = new ShapeCategory(ShapeCornerFamily.Rounded, cornerRadius);
+					shapeScheme.MediumComponentShape = new ShapeCategory(ShapeCornerFamily.Rounded, cornerRadius);
+					shapeScheme.LargeComponentShape = new ShapeCategory(ShapeCornerFamily.Rounded, cornerRadius);
+				}
+			}
 		}
 
 		void UpdateFont()
@@ -249,134 +262,20 @@ namespace Xamarin.Forms.Platform.iOS.Material
 			}
 		}
 
-		void UpdateText()
-		{
-			var newText = Element.Text;
-
-			if (Control.Title(UIControlState.Normal) != newText)
-			{
-				Control.SetTitle(Element.Text, UIControlState.Normal);
-				_titleChanged = true;
-			}
-		}
-
-		async void UpdateImage()
-		{
-			UIButton button = Control;
-			if (button == null)
-				return;
-
-			var uiimage = await Element.Image.GetNativeImageAsync();
-			if (uiimage != null)
-			{
-				button.SetImage(uiimage.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal), UIControlState.Normal);
-				button.ImageView.ContentMode = UIViewContentMode.ScaleAspectFit;
-
-				ComputeEdgeInsets(Control, Element.ContentLayout);
-
-				// disable tint for now
-				// button.SetImageTintColor(UIColor.White, UIControlState.Normal);
-			}
-			else
-			{
-				button.SetImage(null, UIControlState.Normal);
-				ClearEdgeInsets();
-			}
-
-			Element.NativeSizeChanged();
-		}
-
-		void UpdatePadding(UIButton button = null)
-		{
-			var uiElement = button ?? Control;
-			if (uiElement == null)
-				return;
+		// IImageVisualElementRenderer
 
-			if (Element.IsSet(Button.PaddingProperty))
-			{
-				uiElement.ContentEdgeInsets = new UIEdgeInsets(
-					(float)(Element.Padding.Top + _paddingDelta.Top),
-					(float)(Element.Padding.Left + _paddingDelta.Left),
-					(float)(Element.Padding.Bottom + _paddingDelta.Bottom),
-					(float)(Element.Padding.Right + _paddingDelta.Right)
-				);
-			}
-		}
+		bool IImageVisualElementRenderer.IsDisposed => _isDisposed;
 
-		void UpdateContentEdge(UIButton button = null, UIEdgeInsets? delta = null)
-		{
-			var uiElement = button ?? Control;
-			if (uiElement == null)
-				return;
+		void IImageVisualElementRenderer.SetImage(UIImage image) => _buttonLayoutManager.SetImage(image);
 
-			_paddingDelta = delta ?? new UIEdgeInsets();
-			UpdatePadding(uiElement);
-		}
+		UIImageView IImageVisualElementRenderer.GetImage() => Control?.ImageView;
 
-		void ClearEdgeInsets(UIButton button = null)
-		{
-			var uiElement = button ?? Control;
-			if (uiElement == null)
-				return;
+		// IButtonLayoutRenderer
 
-			uiElement.ImageEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
-			uiElement.TitleEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
-			UpdateContentEdge(uiElement);
-		}
+		UIButton IButtonLayoutRenderer.Control => Control;
 
-		void ComputeEdgeInsets(UIButton button, Button.ButtonContentLayout layout)
-		{
-			if (button?.ImageView?.Image == null || string.IsNullOrEmpty(button?.TitleLabel?.Text))
-				return;
-
-			var position = layout.Position;
-			var spacing = (nfloat)(layout.Spacing / 2);
+		IImageVisualElementRenderer IButtonLayoutRenderer.ImageVisualElementRenderer => this;
 
-			if (position == Button.ButtonContentLayout.ImagePosition.Left)
-			{
-				button.ImageEdgeInsets = new UIEdgeInsets(0, -spacing, 0, spacing);
-				button.TitleEdgeInsets = new UIEdgeInsets(0, spacing, 0, -spacing);
-				UpdateContentEdge(button, new UIEdgeInsets(0, 2 * spacing, 0, 2 * spacing));
-				return;
-			}
-
-			if (_titleChanged)
-			{
-				var stringToMeasure = new NSString(button.TitleLabel.Text);
-				UIStringAttributes attribs = new UIStringAttributes { Font = button.TitleLabel.Font };
-				_titleSize = stringToMeasure.GetSizeUsingAttributes(attribs);
-				_titleChanged = false;
-			}
-
-			var labelWidth = _titleSize.Width;
-			var imageWidth = button.ImageView.Image.Size.Width;
-
-			if (position == Button.ButtonContentLayout.ImagePosition.Right)
-			{
-				button.ImageEdgeInsets = new UIEdgeInsets(0, labelWidth + spacing, 0, -labelWidth - spacing);
-				button.TitleEdgeInsets = new UIEdgeInsets(0, -imageWidth - spacing, 0, imageWidth + spacing);
-				UpdateContentEdge(button, new UIEdgeInsets(0, 2 * spacing, 0, 2 * spacing));
-				return;
-			}
-
-			var imageVertOffset = (_titleSize.Height / 2);
-			var titleVertOffset = (button.ImageView.Image.Size.Height / 2);
-
-			var edgeOffset = (float)Math.Min(imageVertOffset, titleVertOffset);
-
-			UpdateContentEdge(button, new UIEdgeInsets(edgeOffset, 0, edgeOffset, 0));
-
-			var horizontalImageOffset = labelWidth / 2;
-			var horizontalTitleOffset = imageWidth / 2;
-
-			if (position == Button.ButtonContentLayout.ImagePosition.Bottom)
-			{
-				imageVertOffset = -imageVertOffset;
-				titleVertOffset = -titleVertOffset;
-			}
-
-			button.ImageEdgeInsets = new UIEdgeInsets(-imageVertOffset, horizontalImageOffset, imageVertOffset, -horizontalImageOffset);
-			button.TitleEdgeInsets = new UIEdgeInsets(titleVertOffset, -horizontalTitleOffset, -titleVertOffset, horizontalTitleOffset);
-		}
+		nfloat IButtonLayoutRenderer.MinimumHeight => _buttonScheme?.MinimumHeight ?? -1;
 	}
-}
\ No newline at end of file
+}
diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs
index 7826257..c76a144 100644
--- a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs
@@ -4,35 +4,31 @@ using Android.Content;
 using Android.Graphics;
 using Android.Support.V7.Widget;
 using Android.Util;
-using Object = Java.Lang.Object;
-using AView = Android.Views.View;
-using AMotionEvent = Android.Views.MotionEvent;
-using AMotionEventActions = Android.Views.MotionEventActions;
-using static System.String;
-using AColor = Android.Graphics.Color;
-using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
+using Android.Views;
 using Xamarin.Forms.Platform.Android.FastRenderers;
+using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
+using AColor = Android.Graphics.Color;
+using AView = Android.Views.View;
 
 namespace Xamarin.Forms.Platform.Android.AppCompat
 {
-	public class ButtonRenderer : ViewRenderer<Button, AppCompatButton>, AView.IOnAttachStateChangeListener, IBorderVisualElementRenderer
+	public class ButtonRenderer : ViewRenderer<Button, AppCompatButton>,
+		AView.IOnAttachStateChangeListener, AView.IOnClickListener, AView.IOnTouchListener,
+		IBorderVisualElementRenderer, IButtonLayoutRenderer
 	{
 		BorderBackgroundManager _backgroundTracker;
 		TextColorSwitcher _textColorSwitcher;
 		float _defaultFontSize;
-		Thickness? _defaultPadding;
 		Typeface _defaultTypeface;
 		bool _isDisposed;
-		int _imageHeight = -1;
-		Thickness _paddingDeltaPix = new Thickness();
-		IVisualElementRenderer _visualElementRenderer;
+		ButtonLayoutManager _buttonLayoutManager;
 		string _defaultContentDescription;
 
 		public ButtonRenderer(Context context) : base(context)
 		{
 			AutoPackage = false;
-			_visualElementRenderer = this;
 			_backgroundTracker = new BorderBackgroundManager(this);
+			_buttonLayoutManager = new ButtonLayoutManager(this);
 		}
 
 		[Obsolete("This constructor is obsolete as of version 2.5. Please use ButtonRenderer(Context) instead.")]
@@ -40,8 +36,8 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 		public ButtonRenderer()
 		{
 			AutoPackage = false;
-			_visualElementRenderer = this;
 			_backgroundTracker = new BorderBackgroundManager(this);
+			_buttonLayoutManager = new ButtonLayoutManager(this);
 		}
 
 		global::Android.Widget.Button NativeButton => Control;
@@ -49,36 +45,21 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 		protected override void SetContentDescription()
 			=> AutomationPropertiesProvider.SetBasicContentDescription(this, Element, ref _defaultContentDescription);
 
-		void AView.IOnAttachStateChangeListener.OnViewAttachedToWindow(AView attachedView)
-		{
-			UpdateText();
-		}
+		void AView.IOnAttachStateChangeListener.OnViewAttachedToWindow(AView attachedView) =>
+			_buttonLayoutManager?.OnViewAttachedToWindow(attachedView);
 
-		void AView.IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView)
-		{
-		}
+		void AView.IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView) =>
+			_buttonLayoutManager?.OnViewDetachedFromWindow(detachedView);
 
 		public override SizeRequest GetDesiredSize(int widthConstraint, int heightConstraint)
 		{
-			UpdateText();
+			_buttonLayoutManager?.Update();
 			return base.GetDesiredSize(widthConstraint, heightConstraint);
 		}
 
 		protected override void OnLayout(bool changed, int l, int t, int r, int b)
 		{
-			if (_imageHeight > -1)
-			{
-				// We've got an image (and no text); it's already centered horizontally,
-				// we just need to adjust the padding so it centers vertically
-				var diff = ((b - Context.ToPixels(Element.Padding.Bottom + Element.Padding.Top)) - t - _imageHeight) / 2;
-				diff = Math.Max(diff, 0);
-				UpdateContentEdge(new Thickness(0, diff, 0, -diff));
-			}
-			else
-			{
-				UpdateContentEdge();
-			}
-
+			_buttonLayoutManager?.OnLayout(changed, l, t, r, b);
 			base.OnLayout(changed, l, t, r, b);
 		}
 
@@ -101,12 +82,12 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 					Control.SetOnClickListener(null);
 					Control.SetOnTouchListener(null);
 					Control.RemoveOnAttachStateChangeListener(this);
-					Control.Tag = null;
 					_textColorSwitcher = null;
 				}
 				_backgroundTracker?.Dispose();
 				_backgroundTracker = null;
-				_visualElementRenderer = null;
+				_buttonLayoutManager?.Dispose();
+				_buttonLayoutManager = null;
 			}
 
 			base.Dispose(disposing);
@@ -122,41 +103,29 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 				{
 					AppCompatButton button = CreateNativeControl();
 
-					button.SetOnClickListener(ButtonClickListener.Instance.Value);
-					button.SetOnTouchListener(ButtonTouchListener.Instance.Value);
-					button.Tag = this;
-
-					var useLegacyColorManagement = e.NewElement.UseLegacyColorManagement();
-					_textColorSwitcher = new TextColorSwitcher(button.TextColors, useLegacyColorManagement);
+					button.SetOnClickListener(this);
+					button.SetOnTouchListener(this);
+					button.AddOnAttachStateChangeListener(this);
+					_textColorSwitcher = new TextColorSwitcher(button.TextColors, e.NewElement.UseLegacyColorManagement());
 
 					SetNativeControl(button);
-					button.AddOnAttachStateChangeListener(this);
 				}
 
-
 				_defaultFontSize = 0f;
-				_defaultPadding = null;
 
+				_buttonLayoutManager?.Update();
 				UpdateAll();
 			}
 		}
 
 		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			if (e.PropertyName == Button.TextProperty.PropertyName)
-				UpdateText();
-			else if (e.PropertyName == Button.TextColorProperty.PropertyName)
+			if (e.PropertyName == Button.TextColorProperty.PropertyName)
 				UpdateTextColor();
 			else if (e.PropertyName == VisualElement.IsEnabledProperty.PropertyName)
 				UpdateEnabled();
 			else if (e.PropertyName == Button.FontProperty.PropertyName)
 				UpdateFont();
-			else if (e.PropertyName == Button.ImageProperty.PropertyName)
-				UpdateBitmap();
-			else if (e.PropertyName == VisualElement.IsVisibleProperty.PropertyName)
-				UpdateText();
-			else if (e.PropertyName == Button.PaddingProperty.PropertyName)
-				UpdatePadding();
 
 			base.OnElementPropertyChanged(sender, e);
 		}
@@ -172,68 +141,9 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 		void UpdateAll()
 		{
 			UpdateFont();
-			UpdateText();
-			UpdateBitmap();
 			UpdateTextColor();
 			UpdateEnabled();
 			UpdateBackgroundColor();
-			UpdatePadding();
-		}
-
-		void UpdateBitmap()
-		{
-			var elementImage = Element.Image;
-			var imageFile = elementImage?.File;
-			_imageHeight = -1;
-
-			if (elementImage == null || string.IsNullOrEmpty(imageFile))
-			{
-				Control.SetCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-				return;
-			}
-
-			var image = Context.GetDrawable(imageFile);
-
-			if (IsNullOrEmpty(Element.Text))
-			{
-				// No text, so no need for relative position; just center the image
-				// There's no option for just plain-old centering, so we'll use Top 
-				// (which handles the horizontal centering) and some tricksy padding (in OnLayout)
-				// to handle the vertical centering 
-
-				// Clear any previous padding and set the image as top/center
-				UpdateContentEdge();
-				Control.SetCompoundDrawablesWithIntrinsicBounds(null, image, null, null);
-
-				// Keep track of the image height so we can use it in OnLayout
-				_imageHeight = image.IntrinsicHeight;
-
-				image?.Dispose();
-				return;
-			}
-
-			var layout = Element.ContentLayout;
-
-			Control.CompoundDrawablePadding = (int)layout.Spacing;
-
-			switch (layout.Position)
-			{
-				case Button.ButtonContentLayout.ImagePosition.Top:
-					Control.SetCompoundDrawablesWithIntrinsicBounds(null, image, null, null);
-					break;
-				case Button.ButtonContentLayout.ImagePosition.Bottom:
-					Control.SetCompoundDrawablesWithIntrinsicBounds(null, null, null, image);
-					break;
-				case Button.ButtonContentLayout.ImagePosition.Right:
-					Control.SetCompoundDrawablesWithIntrinsicBounds(null, null, image, null);
-					break;
-				default:
-					// Defaults to image on the left
-					Control.SetCompoundDrawablesWithIntrinsicBounds(image, null, null, null);
-					break;
-			}
-
-			image?.Dispose();
 		}
 
 		void UpdateEnabled()
@@ -267,56 +177,14 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 			}
 		}
 
-		void UpdateText()
-		{
-			var oldText = NativeButton.Text;
-			NativeButton.Text = Element.Text;
-
-			// If we went from or to having no text, we need to update the image position
-			if (IsNullOrEmpty(oldText) != IsNullOrEmpty(NativeButton.Text))
-			{
-				UpdateBitmap();
-			}
-		}
-
 		void UpdateTextColor()
 		{
 			_textColorSwitcher?.UpdateTextColor(Control, Element.TextColor);
 		}
 
-		void UpdatePadding()
-		{
-			if (Control == null)
-				return;
-
-			if (!_defaultPadding.HasValue)
-				_defaultPadding = new Thickness(Control.PaddingLeft, Control.PaddingTop, Control.PaddingRight, Control.PaddingBottom);
-
-			if (Element.IsSet(Button.PaddingProperty))
-			{
-				Control.SetPadding(
-					(int)(Context.ToPixels(Element.Padding.Left) + _paddingDeltaPix.Left),
-					(int)(Context.ToPixels(Element.Padding.Top) + _paddingDeltaPix.Top),
-					(int)(Context.ToPixels(Element.Padding.Right) + _paddingDeltaPix.Right),
-					(int)(Context.ToPixels(Element.Padding.Bottom) + _paddingDeltaPix.Bottom)
-				);
-			}
-			else
-			{
-				Control.SetPadding(
-						(int)_defaultPadding.Value.Left,
-						(int)_defaultPadding.Value.Top,
-						(int)_defaultPadding.Value.Right,
-						(int)_defaultPadding.Value.Bottom
-					);
-			}
-		}
+		void IOnClickListener.OnClick(AView v) => ButtonElementManager.OnClick(Element, Element, v);
 
-		void UpdateContentEdge(Thickness? delta = null)
-		{
-			_paddingDeltaPix = delta ?? new Thickness();
-			UpdatePadding();			
-		}
+		bool IOnTouchListener.OnTouch(AView v, MotionEvent e) => ButtonElementManager.OnTouch(Element, Element, v, e);
 
 		float IBorderVisualElementRenderer.ShadowRadius => Control.ShadowRadius;
 		float IBorderVisualElementRenderer.ShadowDx => Control.ShadowDx;
@@ -329,46 +197,16 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
 		AView IBorderVisualElementRenderer.View => Control;
 		event EventHandler<VisualElementChangedEventArgs> IBorderVisualElementRenderer.ElementChanged
 		{
-			add => _visualElementRenderer.ElementChanged += value;
-			remove => _visualElementRenderer.ElementChanged -= value;
-		}
-
-		class ButtonClickListener : Object, AView.IOnClickListener
-		{
-			#region Statics
-
-			public static readonly Lazy<ButtonClickListener> Instance = new Lazy<ButtonClickListener>(() => new ButtonClickListener());
-
-			#endregion
-
-			public void OnClick(AView v)
-			{
-				var renderer = v.Tag as ButtonRenderer;
-				((IButtonController)renderer?.Element)?.SendClicked();
-			}
+			add => ((IVisualElementRenderer)this).ElementChanged += value;
+			remove => ((IVisualElementRenderer)this).ElementChanged -= value;
 		}
 
-		class ButtonTouchListener : Object, AView.IOnTouchListener
+		Button IButtonLayoutRenderer.Element => Element;
+		AppCompatButton IButtonLayoutRenderer.View => Control;
+		event EventHandler<VisualElementChangedEventArgs> IButtonLayoutRenderer.ElementChanged
 		{
-			public static readonly Lazy<ButtonTouchListener> Instance = new Lazy<ButtonTouchListener>(() => new ButtonTouchListener());
-
-			public bool OnTouch(AView v, AMotionEvent e)
-			{
-				var renderer = v.Tag as ButtonRenderer;
-				if (renderer != null)
-				{
-					var buttonController = renderer.Element as IButtonController;
-					if (e.Action == AMotionEventActions.Down)
-					{
-						buttonController?.SendPressed();
-					}
-					else if (e.Action == AMotionEventActions.Up)
-					{
-						buttonController?.SendReleased();
-					}
-				}
-				return false;
-			}
+			add => ((IVisualElementRenderer)this).ElementChanged += value;
+			remove => ((IVisualElementRenderer)this).ElementChanged -= value;
 		}
 	}
 }
diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonElementManager.cs b/Xamarin.Forms.Platform.Android/ButtonElementManager.cs
similarity index 66%
rename from Xamarin.Forms.Platform.Android/FastRenderers/ButtonElementManager.cs
rename to Xamarin.Forms.Platform.Android/ButtonElementManager.cs
index 8f5ae0e..bf8e4b0 100644
--- a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonElementManager.cs
+++ b/Xamarin.Forms.Platform.Android/ButtonElementManager.cs
@@ -1,22 +1,18 @@
-
-using Android.Views;
+using Android.Views;
 using AView = Android.Views.View;
-using AMotionEventActions = Android.Views.MotionEventActions;
 
-
-namespace Xamarin.Forms.Platform.Android.FastRenderers
+namespace Xamarin.Forms.Platform.Android
 {
 	public static class ButtonElementManager
 	{
-
 		public static bool OnTouch(VisualElement element, IButtonController buttonController, AView v, MotionEvent e)
 		{
-			switch (e.Action)
+			switch (e.ActionMasked)
 			{
-				case AMotionEventActions.Down:
+				case MotionEventActions.Down:
 					buttonController?.SendPressed();
 					break;
-				case AMotionEventActions.Up:
+				case MotionEventActions.Up:
 					buttonController?.SendReleased();
 					break;
 			}
@@ -24,11 +20,9 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 			return false;
 		}
 
-
-
 		public static void OnClick(VisualElement element, IButtonController buttonController, AView v)
 		{
 			buttonController?.SendClicked();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs b/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs
new file mode 100644
index 0000000..be66f84
--- /dev/null
+++ b/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs
@@ -0,0 +1,301 @@
+using System;
+using System.ComponentModel;
+using Android.Content;
+using Android.Graphics;
+using Android.Graphics.Drawables;
+using Android.Support.V4.View;
+using Android.Support.V4.Widget;
+using Android.Support.V7.Widget;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
+using Specifics = Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
+using AView = Android.Views.View;
+
+namespace Xamarin.Forms.Platform.Android
+{
+	// TODO: Currently the drawable is reloaded if the text or the layout changes.
+	//       This is obviously not great, but it works. An optimization should
+	//       be made to find the drawable in the view and just re-position.
+	//       If we do this, we must remember to undo the offset in OnLayout.
+
+	public class ButtonLayoutManager : IDisposable
+	{
+		// we use left/right as this does not resize the button when there is no text
+		Button.ButtonContentLayout _imageOnlyLayout = new Button.ButtonContentLayout(Button.ButtonContentLayout.ImagePosition.Left, 0);
+
+		// reuse this instance to save on allocations
+		Rect _drawableBounds = new Rect();
+
+		bool _disposed;
+		IButtonLayoutRenderer _renderer;
+		Thickness? _defaultPaddingPix;
+		Button _element;
+		bool _alignIconWithText;
+		bool _preserveInitialPadding;
+		bool _borderAdjustsPadding;
+		bool _maintainLegacyMeasurements;
+
+		public ButtonLayoutManager(IButtonLayoutRenderer renderer) : this(renderer, false, false, false, true)
+		{
+		}
+
+		public ButtonLayoutManager(IButtonLayoutRenderer renderer,
+			bool alignIconWithText,
+			bool preserveInitialPadding,
+			bool borderAdjustsPadding,
+			bool maintainLegacyMeasurements)
+		{
+			_renderer = renderer ?? throw new ArgumentNullException(nameof(renderer));
+			_renderer.ElementChanged += OnElementChanged;
+			_alignIconWithText = alignIconWithText;
+			_preserveInitialPadding = preserveInitialPadding;
+			_borderAdjustsPadding = borderAdjustsPadding;
+			_maintainLegacyMeasurements = maintainLegacyMeasurements;
+		}
+
+		AppCompatButton View => _renderer?.View;
+
+		Context Context => _renderer?.View?.Context;
+
+		public void Dispose()
+		{
+			Dispose(true);
+		}
+
+		protected virtual void Dispose(bool disposing)
+		{
+			if (!_disposed)
+			{
+				if (disposing)
+				{
+					if (_renderer != null)
+					{
+						_renderer.ElementChanged -= OnElementChanged;
+						_renderer = null;
+					}
+				}
+				_disposed = true;
+			}
+		}
+
+		public void OnLayout(bool changed, int left, int top, int right, int bottom)
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			AppCompatButton view = View;
+			if (view == null || view.Layout == null)
+				return;
+
+			Drawable drawable = null;
+			Drawable[] drawables = TextViewCompat.GetCompoundDrawablesRelative(view);
+			if(drawables != null)
+			{
+				foreach (var compoundDrawable in drawables)
+				{
+					if (compoundDrawable != null)
+					{
+						drawable = compoundDrawable;						
+						break;
+					}
+				}
+			}
+
+
+			if (drawable != null)
+			{
+				int iconWidth = drawable.IntrinsicWidth;
+				drawable.CopyBounds(_drawableBounds);
+
+				// Center the drawable in the button if there is no text.
+				// We do not need to undo this as when we get some text, the drawable recreated
+				if (string.IsNullOrEmpty(_element.Text))
+				{
+					var newLeft = (right - left - iconWidth) / 2 - view.PaddingLeft;
+
+					_drawableBounds.Set(newLeft, _drawableBounds.Top, newLeft + iconWidth, _drawableBounds.Bottom);
+					drawable.Bounds = _drawableBounds;
+				}
+				else
+				{
+					if (_alignIconWithText && _element.ContentLayout.IsHorizontal())
+					{
+						var buttonText = view.TextFormatted;
+
+						// if text is transformed, add that transformation to to ensure correct calculation of icon padding
+						if (view.TransformationMethod != null)
+							buttonText = view.TransformationMethod.GetTransformationFormatted(buttonText, view);
+
+						var measuredTextWidth = view.Paint.MeasureText(buttonText, 0, buttonText.Length());
+						var textWidth = Math.Min((int)measuredTextWidth, view.Layout.Width);
+						var contentsWidth = ViewCompat.GetPaddingStart(view) + iconWidth + view.CompoundDrawablePadding + textWidth + ViewCompat.GetPaddingEnd(view);
+
+						var newLeft = (view.MeasuredWidth - contentsWidth) / 2;
+						if (_element.ContentLayout.Position == Button.ButtonContentLayout.ImagePosition.Right)
+							newLeft = -newLeft;
+						if (ViewCompat.GetLayoutDirection(view) == ViewCompat.LayoutDirectionRtl)
+							newLeft = -newLeft;
+
+						_drawableBounds.Set(newLeft, _drawableBounds.Top, newLeft + iconWidth, _drawableBounds.Bottom);
+						drawable.Bounds = _drawableBounds;
+					}
+				}
+			}
+		}
+
+		public void OnViewAttachedToWindow(AView attachedView)
+		{
+			Update();
+		}
+
+		public void OnViewDetachedFromWindow(AView detachedView)
+		{
+		}
+
+		public void Update()
+		{
+			if (!UpdateTextAndImage())
+				UpdateImage();
+			UpdatePadding();
+		}
+
+		void OnElementChanged(object sender, VisualElementChangedEventArgs e)
+		{
+			if (_element != null)
+			{
+				_element.PropertyChanged -= OnElementPropertyChanged;
+				_element = null;
+			}
+
+			if (e.NewElement is Button button)
+			{
+				_element = button;
+				_element.PropertyChanged += OnElementPropertyChanged;
+			}
+
+			Update();
+		}
+
+		void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			if (e.PropertyName == Button.PaddingProperty.PropertyName)
+				UpdatePadding();
+			else if (e.PropertyName == Button.ImageProperty.PropertyName || e.PropertyName == Button.ContentLayoutProperty.PropertyName)
+				UpdateImage();
+			else if (e.PropertyName == Button.TextProperty.PropertyName || e.PropertyName == VisualElement.IsVisibleProperty.PropertyName)
+				UpdateTextAndImage();
+			else if (e.PropertyName == Button.BorderWidthProperty.PropertyName && _borderAdjustsPadding)
+				_element.InvalidateMeasureNonVirtual(InvalidationTrigger.MeasureChanged);
+		}
+
+		void UpdatePadding()
+		{
+			AppCompatButton view = View;
+			if (view == null)
+				return;
+
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			if (!_defaultPaddingPix.HasValue)
+				_defaultPaddingPix = new Thickness(view.PaddingLeft, view.PaddingTop, view.PaddingRight, view.PaddingBottom);
+
+			// Currently the Padding Bindable property uses a creator factory so once it is set it can't become unset
+			// I would say this is currently a bug but it's a bug that exists already in the code base.
+			// Having this comment and this code more accurately demonstrates behavior then
+			// having an else clause for when the PaddingProperty isn't set
+			if (!_element.IsSet(Button.PaddingProperty))
+				return;
+
+			var padding = _element.Padding;
+			var adjustment = 0.0;
+			if (_borderAdjustsPadding && _element is IBorderElement borderElement && borderElement.IsBorderWidthSet() && borderElement.BorderWidth != borderElement.BorderWidthDefaultValue)
+				adjustment = borderElement.BorderWidth;
+
+			var defaultPadding = _preserveInitialPadding && _defaultPaddingPix.HasValue
+				? _defaultPaddingPix.Value
+				: new Thickness();
+
+			view.SetPadding(
+				(int)(Context.ToPixels(padding.Left + adjustment) + defaultPadding.Left),
+				(int)(Context.ToPixels(padding.Top + adjustment) + defaultPadding.Top),
+				(int)(Context.ToPixels(padding.Right + adjustment) + defaultPadding.Right),
+				(int)(Context.ToPixels(padding.Bottom + adjustment) + defaultPadding.Bottom));
+		}
+
+		bool UpdateTextAndImage()
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return false;
+
+			AppCompatButton view = View;
+			if (view == null)
+				return false;
+
+			string oldText = view.Text;
+			view.Text = _element.Text;
+
+			// If we went from or to having no text, we need to update the image position
+			if (string.IsNullOrEmpty(oldText) != string.IsNullOrEmpty(view.Text))
+			{
+				UpdateImage();
+				return true;
+			}
+
+			return false;
+		}
+
+		void UpdateImage()
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			AppCompatButton view = View;
+			if (view == null)
+				return;
+
+			FileImageSource elementImage = _element.Image;
+			string imageFile = elementImage?.File;
+
+			if (elementImage == null || string.IsNullOrEmpty(imageFile))
+			{
+				view.SetCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+				return;
+			}
+
+			using (var image = Context.GetDrawable(imageFile))
+			{
+				// No text, so no need for relative position; just center the image
+				// There's no option for just plain-old centering, so we'll use Top 
+				// (which handles the horizontal centering) and some tricksy padding (in OnLayout)
+				// to handle the vertical centering 
+				var layout = string.IsNullOrEmpty(_element.Text) ? _imageOnlyLayout : _element.ContentLayout;
+
+				if(_maintainLegacyMeasurements)
+					view.CompoundDrawablePadding = (int)layout.Spacing;
+				else
+					view.CompoundDrawablePadding = (int)Context.ToPixels(layout.Spacing);
+
+				switch (layout.Position)
+				{
+					case Button.ButtonContentLayout.ImagePosition.Top:
+						TextViewCompat.SetCompoundDrawablesRelativeWithIntrinsicBounds(view, null, image, null, null);
+						break;
+					case Button.ButtonContentLayout.ImagePosition.Right:
+						TextViewCompat.SetCompoundDrawablesRelativeWithIntrinsicBounds(view, null, null, image, null);
+						break;
+					case Button.ButtonContentLayout.ImagePosition.Bottom:
+						TextViewCompat.SetCompoundDrawablesRelativeWithIntrinsicBounds(view, null, null, null, image);
+						break;
+					default:
+						// Defaults to image on the left
+						TextViewCompat.SetCompoundDrawablesRelativeWithIntrinsicBounds(view, image, null, null, null);
+						break;
+				}
+			}
+		}
+	}
+}
diff --git a/Xamarin.Forms.Platform.Android/Extensions.cs b/Xamarin.Forms.Platform.Android/Extensions.cs
index 227f984..3c9b33e 100644
--- a/Xamarin.Forms.Platform.Android/Extensions.cs
+++ b/Xamarin.Forms.Platform.Android/Extensions.cs
@@ -37,5 +37,9 @@ namespace Xamarin.Forms.Platform.Android
 					return DeviceOrientation.Other;
 			}
 		}
+
+		internal static bool IsHorizontal(this Button.ButtonContentLayout layout) =>
+			layout.Position == Button.ButtonContentLayout.ImagePosition.Left ||
+			layout.Position == Button.ButtonContentLayout.ImagePosition.Right;
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs
index 4ad52a7..d2b8b20 100644
--- a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs
@@ -2,34 +2,32 @@ using System;
 using System.ComponentModel;
 using Android.Content;
 using Android.Graphics;
-using Android.Graphics.Drawables;
+using Android.Support.V4.View;
 using Android.Support.V7.Widget;
 using Android.Util;
 using Android.Views;
 using Xamarin.Forms.Internals;
-using AView = Android.Views.View;
-using static System.String;
-using Android.Support.V4.View;
-using AColor = Android.Graphics.Color;
 using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
+using AColor = Android.Graphics.Color;
+using AView = Android.Views.View;
 
 namespace Xamarin.Forms.Platform.Android.FastRenderers
 {
-	internal sealed class ButtonRenderer : AppCompatButton, IVisualElementRenderer, AView.IOnAttachStateChangeListener,
-		AView.IOnFocusChangeListener, AView.IOnClickListener, AView.IOnTouchListener, IViewRenderer, ITabStop, IBorderVisualElementRenderer
+	internal sealed class ButtonRenderer : AppCompatButton,
+		IBorderVisualElementRenderer, IButtonLayoutRenderer, IVisualElementRenderer, IViewRenderer, ITabStop,
+		AView.IOnAttachStateChangeListener, AView.IOnFocusChangeListener, AView.IOnClickListener, AView.IOnTouchListener
 	{
 		float _defaultFontSize;
 		int? _defaultLabelFor;
 		Typeface _defaultTypeface;
-		int _imageHeight = -1;
 		bool _isDisposed;
 		bool _inputTransparent;
 		Lazy<TextColorSwitcher> _textColorSwitcher;
-		readonly AutomationPropertiesProvider _automationPropertiesProvider;
+		AutomationPropertiesProvider _automationPropertiesProvider;
 		VisualElementTracker _tracker;
 		VisualElementRenderer _visualElementRenderer;
 		BorderBackgroundManager _backgroundTracker;
-		Thickness _paddingDeltaPix = new Thickness();
+		ButtonLayoutManager _buttonLayoutManager;
 		IPlatformElementConfiguration<PlatformConfiguration.Android, Button> _platformElementConfiguration;
 		private Button _button;
 
@@ -38,8 +36,6 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 
 		public ButtonRenderer(Context context) : base(context)
 		{
-			_automationPropertiesProvider = new AutomationPropertiesProvider(this);
-
 			Initialize();
 		}
 
@@ -47,8 +43,6 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public ButtonRenderer() : base(Forms.Context)
 		{
-			_automationPropertiesProvider = new AutomationPropertiesProvider(this);
-
 			Initialize();
 		}
 
@@ -73,14 +67,11 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 
 		bool IOnTouchListener.OnTouch(AView v, MotionEvent e) => ButtonElementManager.OnTouch(Button, Button, v, e);
 
-		void IOnAttachStateChangeListener.OnViewAttachedToWindow(AView attachedView)
-		{
-			UpdateText();
-		}
+		void IOnAttachStateChangeListener.OnViewAttachedToWindow(AView attachedView) =>
+			_buttonLayoutManager.OnViewAttachedToWindow(attachedView);
 
-		void IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView)
-		{
-		}
+		void IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView) =>
+			_buttonLayoutManager.OnViewDetachedFromWindow(detachedView);
 
 		void IOnFocusChangeListener.OnFocusChange(AView v, bool hasFocus)
 		{
@@ -89,11 +80,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 
 		SizeRequest IVisualElementRenderer.GetDesiredSize(int widthConstraint, int heightConstraint)
 		{
-			UpdateText();
-
-			AView view = this;
-			view.Measure(widthConstraint, heightConstraint);
-
+			Measure(widthConstraint, heightConstraint);
 			return new SizeRequest(new Size(MeasuredWidth, MeasuredHeight), MinimumSize());
 		}
 
@@ -176,6 +163,8 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 				_visualElementRenderer?.Dispose();
 				_backgroundTracker?.Dispose();
 				_backgroundTracker = null;
+				_buttonLayoutManager?.Dispose();
+				_buttonLayoutManager = null;
 
 				if (Element != null)
 				{
@@ -212,12 +201,10 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 					() => new TextColorSwitcher(TextColors, e.NewElement.UseLegacyColorManagement()));
 
 				UpdateFont();
-				UpdateText();
-				UpdateBitmap();
 				UpdateTextColor();
 				UpdateInputTransparent();
 				UpdateBackgroundColor();
-				UpdatePadding();
+				_buttonLayoutManager?.Update();
 
 				ElevationHelper.SetElevation(this, e.NewElement);
 			}
@@ -227,11 +214,7 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 
 		void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
 		{
-			if (e.PropertyName == Button.TextProperty.PropertyName)
-			{
-				UpdateText();
-			}
-			else if (e.PropertyName == Button.TextColorProperty.PropertyName)
+			if (e.PropertyName == Button.TextColorProperty.PropertyName)
 			{
 				UpdateTextColor();
 			}
@@ -239,49 +222,26 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 			{
 				UpdateFont();
 			}
-			else if (e.PropertyName == Button.ImageProperty.PropertyName)
-			{
-				UpdateBitmap();
-			}
-			else if (e.PropertyName == VisualElement.IsVisibleProperty.PropertyName)
-			{
-				UpdateText();
-			}
 			else if (e.PropertyName == VisualElement.InputTransparentProperty.PropertyName)
 			{
 				UpdateInputTransparent();
 			}
-			else if (e.PropertyName == Button.PaddingProperty.PropertyName)
-			{
-				UpdatePadding();
-			}
 
 			ElementPropertyChanged?.Invoke(this, e);
 		}
 
 		protected override void OnLayout(bool changed, int l, int t, int r, int b)
 		{
-			if (Element == null || _isDisposed)
-			{
-				return;
-			}
-
-			if (_imageHeight > -1)
-			{
-				// We've got an image (and no text); it's already centered horizontally,
-				// we just need to adjust the padding so it centers vertically
-				var diff = ((b - Context.ToPixels(Button.Padding.Bottom + Button.Padding.Top)) - t - _imageHeight) / 2;
-				diff = Math.Max(diff, 0);
-				UpdateContentEdge(new Thickness(0, diff, 0, -diff));
-			}
-			else
-			{
-				UpdateContentEdge();
-			}
-
+			_buttonLayoutManager?.OnLayout(changed, l, t, r, b);
 			base.OnLayout(changed, l, t, r, b);
 		}
 
+		protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
+		{
+			_buttonLayoutManager?.Update();
+			base.OnMeasure(widthMeasureSpec, heightMeasureSpec);
+		}
+
 		void SetTracker(VisualElementTracker tracker)
 		{
 			_tracker = tracker;
@@ -303,6 +263,10 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 
 		void Initialize()
 		{
+			_automationPropertiesProvider = new AutomationPropertiesProvider(this);
+			_buttonLayoutManager = new ButtonLayoutManager(this);
+			_backgroundTracker = new BorderBackgroundManager(this);
+
 			SoundEffectsEnabled = false;
 			SetOnClickListener(this);
 			SetOnTouchListener(this);
@@ -310,68 +274,6 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 			OnFocusChangeListener = this;
 
 			Tag = this;
-			_backgroundTracker = new BorderBackgroundManager(this);
-		}
-
-		void UpdateBitmap()
-		{
-			if (Element == null || _isDisposed)
-			{
-				return;
-			}
-
-			FileImageSource elementImage = Button.Image;
-			string imageFile = elementImage?.File;
-			_imageHeight = -1;
-
-			if (elementImage == null || IsNullOrEmpty(imageFile))
-			{
-				SetCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-				return;
-			}
-
-			Drawable image = Context.GetDrawable(imageFile);
-
-			if (IsNullOrEmpty(Button.Text))
-			{
-				// No text, so no need for relative position; just center the image
-				// There's no option for just plain-old centering, so we'll use Top 
-				// (which handles the horizontal centering) and some tricksy padding (in OnLayout)
-				// to handle the vertical centering 
-
-				// Clear any previous padding and set the image as top/center
-				UpdateContentEdge();
-				SetCompoundDrawablesWithIntrinsicBounds(null, image, null, null);
-
-				// Keep track of the image height so we can use it in OnLayout
-				_imageHeight = image.IntrinsicHeight;
-
-				image.Dispose();
-				return;
-			}
-
-			Button.ButtonContentLayout layout = Button.ContentLayout;
-
-			CompoundDrawablePadding = (int)layout.Spacing;
-
-			switch (layout.Position)
-			{
-				case Button.ButtonContentLayout.ImagePosition.Top:
-					SetCompoundDrawablesWithIntrinsicBounds(null, image, null, null);
-					break;
-				case Button.ButtonContentLayout.ImagePosition.Bottom:
-					SetCompoundDrawablesWithIntrinsicBounds(null, null, null, image);
-					break;
-				case Button.ButtonContentLayout.ImagePosition.Right:
-					SetCompoundDrawablesWithIntrinsicBounds(null, null, image, null);
-					break;
-				default:
-					// Defaults to image on the left
-					SetCompoundDrawablesWithIntrinsicBounds(image, null, null, null);
-					break;
-			}
-
-			image?.Dispose();
 		}
 
 		void UpdateFont()
@@ -416,26 +318,6 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 			_inputTransparent = Element.InputTransparent;
 		}
 
-		void UpdateText()
-		{
-			if (Element == null || _isDisposed)
-			{
-				return;
-			}
-
-			string oldText = Text;
-			string newText = Button.Text;
-
-			if (oldText != newText)
-				Text = newText;
-
-			// If we went from or to having no text, we need to update the image position
-			if (IsNullOrEmpty(oldText) != IsNullOrEmpty(newText))
-			{
-				UpdateBitmap();
-			}
-		}
-
 		void UpdateTextColor()
 		{
 			if (Element == null || _isDisposed || _textColorSwitcher == null)
@@ -446,22 +328,6 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 			_textColorSwitcher.Value.UpdateTextColor(this, Button.TextColor);
 		}
 
-		void UpdatePadding()
-		{
-			SetPadding(
-				(int)(Context.ToPixels(Button.Padding.Left) + _paddingDeltaPix.Left),
-				(int)(Context.ToPixels(Button.Padding.Top) + _paddingDeltaPix.Top),
-				(int)(Context.ToPixels(Button.Padding.Right) + _paddingDeltaPix.Right),
-				(int)(Context.ToPixels(Button.Padding.Bottom) + _paddingDeltaPix.Bottom)
-			);
-		}
-
-		void UpdateContentEdge(Thickness? delta = null)
-		{
-			_paddingDeltaPix = delta ?? new Thickness();
-			UpdatePadding();
-		}
-
 		float IBorderVisualElementRenderer.ShadowRadius => ShadowRadius;
 		float IBorderVisualElementRenderer.ShadowDx => ShadowDx;
 		float IBorderVisualElementRenderer.ShadowDy => ShadowDy;
@@ -478,5 +344,13 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers
 
 			return _platformElementConfiguration;
 		}
+
+		Button IButtonLayoutRenderer.Element => Button;
+		AppCompatButton IButtonLayoutRenderer.View => this;
+		event EventHandler<VisualElementChangedEventArgs> IButtonLayoutRenderer.ElementChanged
+		{
+			add => ((IVisualElementRenderer)this).ElementChanged += value;
+			remove => ((IVisualElementRenderer)this).ElementChanged -= value;
+		}
 	}
 }
diff --git a/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs b/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs
new file mode 100644
index 0000000..85328e8
--- /dev/null
+++ b/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs
@@ -0,0 +1,12 @@
+using System;
+using Android.Support.V7.Widget;
+
+namespace Xamarin.Forms.Platform.Android
+{
+	public interface IButtonLayoutRenderer
+	{
+		AppCompatButton View { get; }
+		Button Element { get; }
+		event EventHandler<VisualElementChangedEventArgs> ElementChanged;
+	}
+}
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.Android/Material/MaterialButtonRenderer.cs b/Xamarin.Forms.Platform.Android/Material/MaterialButtonRenderer.cs
index b1f048b..e0102e0 100644
--- a/Xamarin.Forms.Platform.Android/Material/MaterialButtonRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/Material/MaterialButtonRenderer.cs
@@ -4,9 +4,8 @@ using System.ComponentModel;
 using Android.Content;
 using Android.Content.Res;
 using Android.Graphics;
-using Android.Graphics.Drawables;
 using Android.Support.V4.View;
-using Android.Support.V4.Widget;
+using Android.Support.V7.Widget;
 using Android.Util;
 using Android.Views;
 using Xamarin.Forms;
@@ -16,7 +15,6 @@ using Xamarin.Forms.Platform.Android.Material;
 using Xamarin.Forms.PlatformConfiguration.AndroidSpecific;
 using AColor = Android.Graphics.Color;
 using AView = Android.Views.View;
-using AViewCompat = Android.Support.V4.View.ViewCompat;
 using MButton = Android.Support.Design.Button.MaterialButton;
 
 [assembly: ExportRenderer(typeof(Xamarin.Forms.Button), typeof(MaterialButtonRenderer), new[] { typeof(VisualRendererMarker.Material) })]
@@ -24,7 +22,7 @@ using MButton = Android.Support.Design.Button.MaterialButton;
 namespace Xamarin.Forms.Platform.Android.Material
 {
 	public class MaterialButtonRenderer : MButton,
-		IBorderVisualElementRenderer, IVisualElementRenderer, IViewRenderer, ITabStop,
+		IBorderVisualElementRenderer, IButtonLayoutRenderer, IVisualElementRenderer, IViewRenderer, ITabStop,
 		AView.IOnAttachStateChangeListener, AView.IOnFocusChangeListener, AView.IOnClickListener, AView.IOnTouchListener
 	{
 		int _defaultCornerRadius = -1;
@@ -32,19 +30,17 @@ namespace Xamarin.Forms.Platform.Android.Material
 		ColorStateList _defaultBorderColor;
 		float _defaultFontSize = -1;
 		int? _defaultLabelFor;
-		int _defaultIconPadding = -1;
 		Typeface _defaultTypeface;
 
 		bool _disposed;
 		bool _inputTransparent;
-		Thickness _paddingDeltaPix;
-		int _imageHeight = -1;
 
 		Button _button;
 
 		IPlatformElementConfiguration<PlatformConfiguration.Android, Button> _platformElementConfiguration;
 		VisualElementTracker _tracker;
 		VisualElementRenderer _visualElementRenderer;
+		ButtonLayoutManager _buttonLayoutManager;
 
 		readonly AutomationPropertiesProvider _automationPropertiesProvider;
 
@@ -57,6 +53,11 @@ namespace Xamarin.Forms.Platform.Android.Material
 			VisualElement.VerifyVisualFlagEnabled();
 
 			_automationPropertiesProvider = new AutomationPropertiesProvider(this);
+			_buttonLayoutManager = new ButtonLayoutManager(this,
+				alignIconWithText: true,
+				preserveInitialPadding: true,
+				borderAdjustsPadding: false,
+				maintainLegacyMeasurements: false);
 
 			SoundEffectsEnabled = false;
 			SetOnClickListener(this);
@@ -122,6 +123,8 @@ namespace Xamarin.Forms.Platform.Android.Material
 				_automationPropertiesProvider?.Dispose();
 				_tracker?.Dispose();
 				_visualElementRenderer?.Dispose();
+				_buttonLayoutManager?.Dispose();
+				_buttonLayoutManager = null;
 
 				if (Element != null)
 				{
@@ -149,11 +152,9 @@ namespace Xamarin.Forms.Platform.Android.Material
 			{
 				this.EnsureId();
 
+				_buttonLayoutManager?.Update();
 				UpdateBorder();
 				UpdateFont();
-				UpdateImage();
-				UpdatePadding();
-				UpdateText();
 				UpdatePrimaryColors();
 				UpdateInputTransparent();
 
@@ -169,12 +170,6 @@ namespace Xamarin.Forms.Platform.Android.Material
 				UpdateBorder();
 			else if (e.PropertyName == Button.FontProperty.PropertyName)
 				UpdateFont();
-			else if (e.PropertyName == Button.ImageProperty.PropertyName)
-				UpdateImage();
-			else if (e.PropertyName == Button.PaddingProperty.PropertyName)
-				UpdatePadding();
-			else if (e.PropertyName == Button.TextProperty.PropertyName || e.PropertyName == VisualElement.IsVisibleProperty.PropertyName)
-				UpdateText();
 			else if (e.PropertyName == Button.TextColorProperty.PropertyName || e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
 				UpdatePrimaryColors();
 			else if (e.PropertyName == VisualElement.InputTransparentProperty.PropertyName)
@@ -185,97 +180,14 @@ namespace Xamarin.Forms.Platform.Android.Material
 
 		protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
 		{
-			if (_disposed || Element == null)
-				return;
-
-			if (_imageHeight > -1)
-			{
-				// We've got an image (and no text); it's already centered horizontally,
-				// we just need to adjust the padding so it centers vertically
-				var diff = ((bottom - Context.ToPixels(Element.Padding.Bottom + Element.Padding.Top)) - top - _imageHeight) / 2;
-				diff = Math.Max(diff, 0);
-				UpdateContentEdge(new Thickness(0, diff, 0, -diff));
-			}
-			else
-			{
-				UpdateContentEdge();
-			}
-
+			_buttonLayoutManager?.OnLayout(changed, left, top, right, bottom);
 			base.OnLayout(changed, left, top, right, bottom);
 		}
 
 		protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec)
 		{
+			_buttonLayoutManager?.Update();
 			base.OnMeasure(widthMeasureSpec, heightMeasureSpec);
-
-			var images = TextViewCompat.GetCompoundDrawablesRelative(this);
-			if (images.Length > 0 && images[0] != null && Element.ContentLayout.Position == Button.ButtonContentLayout.ImagePosition.Right)
-			{
-				var bounds = images[0].Bounds;
-				int width = images[0].IntrinsicWidth;
-				Icon.SetBounds(-bounds.Left, bounds.Top, width - bounds.Left, bounds.Bottom);
-				TextViewCompat.SetCompoundDrawablesRelative(this, null, null, Icon, null);
-			}
-		}
-
-		void UpdateImage()
-		{
-			if (_disposed || Element == null)
-				return;
-
-			FileImageSource elementImage = Element.Image;
-			string imageFile = elementImage?.File;
-			_imageHeight = -1;
-
-			if (elementImage == null || string.IsNullOrEmpty(imageFile))
-			{
-				SetCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-				return;
-			}
-
-			Drawable image = Context.GetDrawable(imageFile);
-			Button.ButtonContentLayout layout = Element.ContentLayout;
-
-			if (_defaultIconPadding == -1)
-				_defaultIconPadding = IconPadding;
-
-			if (_defaultIconPadding == -1)
-				_defaultIconPadding = 0;
-
-			// disable tint for now
-			IconTint = null;
-			Icon = image;
-
-			if (layout.Position == Button.ButtonContentLayout.ImagePosition.Right || layout.Position == Button.ButtonContentLayout.ImagePosition.Left)
-			{
-				IconGravity = IconGravityTextStart;
-				// setting the icon property causes the base class to calculate things like padding
-				// required to set the image to the start of the text
-				if (string.IsNullOrEmpty(Element.Text))
-					IconPadding = 0;
-				else
-					IconPadding = (int)Context.ToPixels(layout.Spacing) + _defaultIconPadding;
-
-				image?.Dispose();
-				image = TextViewCompat.GetCompoundDrawablesRelative(this)[0];
-			}
-
-			switch (layout.Position)
-			{
-				case Button.ButtonContentLayout.ImagePosition.Top:
-					TextViewCompat.SetCompoundDrawablesRelativeWithIntrinsicBounds(this, null, image, null, null);
-					break;
-				case Button.ButtonContentLayout.ImagePosition.Bottom:
-					TextViewCompat.SetCompoundDrawablesRelativeWithIntrinsicBounds(this, null, null, null, image);
-					break;
-				case Button.ButtonContentLayout.ImagePosition.Right:
-					// this gets set and updated inside OnMeasure
-					break;
-				default:
-					// Defaults to image on the left
-					TextViewCompat.SetCompoundDrawablesRelative(this, image, null, null, null);
-					break;
-			}
 		}
 
 		void UpdateFont()
@@ -304,33 +216,6 @@ namespace Xamarin.Forms.Platform.Android.Material
 				SetTextSize(ComplexUnitType.Sp, font.ToScaledPixel());
 		}
 
-		void UpdateText()
-		{
-			if (_disposed || Element == null)
-				return;
-
-			string oldText = Text;
-			Text = Element.Text;
-
-			// If we went from or to having no text, we need to update the image position
-			if (string.IsNullOrEmpty(oldText) != string.IsNullOrEmpty(Text))
-			{
-				UpdateImage();
-			}
-		}
-
-		void UpdatePadding()
-		{
-			if (Element.IsSet(Button.PaddingProperty))
-			{
-				SetPadding(
-					(int)(Context.ToPixels(Element.Padding.Left) + _paddingDeltaPix.Left),
-					(int)(Context.ToPixels(Element.Padding.Top) + _paddingDeltaPix.Top),
-					(int)(Context.ToPixels(Element.Padding.Right) + _paddingDeltaPix.Right),
-					(int)(Context.ToPixels(Element.Padding.Bottom) + _paddingDeltaPix.Bottom));
-			}
-		}
-
 		void UpdateBorder()
 		{
 			if (_disposed || Element == null)
@@ -357,7 +242,7 @@ namespace Xamarin.Forms.Platform.Android.Material
 				if (borderColor.IsDefault)
 					StrokeColor = _defaultBorderColor;
 				else
-					base.StrokeColor = new ColorStateList(new[] { new int[0] }, new int[] { borderColor.ToAndroid() });
+					StrokeColor = new ColorStateList(new[] { new int[0] }, new int[] { borderColor.ToAndroid() });
 			}
 
 			double borderWidth = Element.BorderWidth;
@@ -366,10 +251,15 @@ namespace Xamarin.Forms.Platform.Android.Material
 				if (_defaultBorderWidth < 0)
 					_defaultBorderWidth = StrokeWidth;
 
+				// TODO: The Material button does not support borders:
+				//       https://github.com/xamarin/Xamarin.Forms/issues/4951
+				if (borderWidth > 1)
+					borderWidth = 1;
+
 				if (borderWidth < 0f)
 					StrokeWidth = _defaultBorderWidth;
 				else
-					base.StrokeWidth = (int)Context.ToPixels(borderWidth);
+					StrokeWidth = (int)Context.ToPixels(borderWidth);
 			}
 		}
 
@@ -404,13 +294,7 @@ namespace Xamarin.Forms.Platform.Android.Material
 
 			// apply
 			SetTextColor(MaterialColors.CreateButtonTextColors(background, text));
-			AViewCompat.SetBackgroundTintList(this, MaterialColors.CreateButtonBackgroundColors(background));
-		}
-
-		void UpdateContentEdge(Thickness? delta = null)
-		{
-			_paddingDeltaPix = delta ?? new Thickness();
-			UpdatePadding();
+			ViewCompat.SetBackgroundTintList(this, MaterialColors.CreateButtonBackgroundColors(background));
 		}
 
 		IPlatformElementConfiguration<PlatformConfiguration.Android, Button> OnThisPlatform() =>
@@ -419,11 +303,10 @@ namespace Xamarin.Forms.Platform.Android.Material
 		// IOnAttachStateChangeListener
 
 		void IOnAttachStateChangeListener.OnViewAttachedToWindow(AView attachedView) =>
-			UpdateText();
+			_buttonLayoutManager?.OnViewAttachedToWindow(attachedView);
 
-		void IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView)
-		{
-		}
+		void IOnAttachStateChangeListener.OnViewDetachedFromWindow(AView detachedView) =>
+			_buttonLayoutManager?.OnViewDetachedFromWindow(detachedView);
 
 		// IOnFocusChangeListener
 
@@ -432,11 +315,13 @@ namespace Xamarin.Forms.Platform.Android.Material
 
 		// IOnClickListener
 
-		void IOnClickListener.OnClick(AView v) => ButtonElementManager.OnClick(Element, Element, v);
+		void IOnClickListener.OnClick(AView v) =>
+			ButtonElementManager.OnClick(Element, Element, v);
 
 		// IOnTouchListener
 
-		bool IOnTouchListener.OnTouch(AView v, MotionEvent e) => ButtonElementManager.OnTouch(Element, Element, v, e);
+		bool IOnTouchListener.OnTouch(AView v, MotionEvent e) =>
+			ButtonElementManager.OnTouch(Element, Element, v, e);
 
 		// IBorderVisualElementRenderer
 
@@ -450,6 +335,11 @@ namespace Xamarin.Forms.Platform.Android.Material
 		VisualElement IBorderVisualElementRenderer.Element => Element;
 		AView IBorderVisualElementRenderer.View => this;
 
+		// IButtonLayoutRenderer
+
+		Button IButtonLayoutRenderer.Element => Element;
+		AppCompatButton IButtonLayoutRenderer.View => this;
+
 		// IVisualElementRenderer
 
 		VisualElement IVisualElementRenderer.Element => Element;
@@ -459,15 +349,8 @@ namespace Xamarin.Forms.Platform.Android.Material
 
 		SizeRequest IVisualElementRenderer.GetDesiredSize(int widthConstraint, int heightConstraint)
 		{
-			UpdateText();
-
-			AView view = this;
-
-			// with material something is removing the padding between it being set and 
-			// the measure call that's requested here
-			UpdatePadding();
-			view.Measure(widthConstraint, heightConstraint);
-
+			_buttonLayoutManager?.Update();
+			Measure(widthConstraint, heightConstraint);
 			return new SizeRequest(new Size(MeasuredWidth, MeasuredHeight), new Size());
 		}
 
diff --git a/Xamarin.Forms.Platform.Android/Resources/values/styles.xml b/Xamarin.Forms.Platform.Android/Resources/values/styles.xml
index cdbe5e5..ac75320 100644
--- a/Xamarin.Forms.Platform.Android/Resources/values/styles.xml
+++ b/Xamarin.Forms.Platform.Android/Resources/values/styles.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resources>
+
+  <!-- Material Base Theme -->
   <style name="XamarinFormsMaterialTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
     <item name="materialButtonStyle">@style/XamarinFormsMaterialButton</item>
   </style>
+
+  <!-- Material Progress Bars -->
   <style name="XamarinFormsMaterialProgressBarHorizontal" parent="Widget.AppCompat.ProgressBar.Horizontal">
   </style>
   <style name="XamarinFormsMaterialProgressBarCircular" parent="Widget.AppCompat.ProgressBar">
     <item name="android:background">@drawable/MaterialActivityIndicatorBackground</item>
   </style>
+  <!-- Material Buttons (All Styles) -->
   <style name="XamarinFormsMaterialButton" parent="Widget.MaterialComponents.Button">
     <item name="android:insetTop">0dp</item>
     <item name="android:insetBottom">0dp</item>
@@ -18,4 +23,4 @@
   <style name="XamarinFormsMaterialEntryFilled" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
     <item name="boxCollapsedPaddingTop">8dp</item>
   </style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
index 2aef0dd..aaa1227 100644
--- a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
+++ b/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
@@ -101,7 +101,6 @@
     <Compile Include="FastRenderers\AutomationPropertiesProvider.cs" />
     <Compile Include="AppCompat\PageExtensions.cs" />
     <Compile Include="Extensions\JavaObjectExtensions.cs" />
-    <Compile Include="FastRenderers\ButtonElementManager.cs" />
     <Compile Include="FastRenderers\ButtonRenderer.cs" />
     <Compile Include="AppCompat\FormsViewPager.cs" />
     <Compile Include="AppCompat\FragmentContainer.cs" />
@@ -311,6 +310,9 @@
     <Compile Include="Renderers\IPopupTrigger.cs" />
     <Compile Include="Material\MaterialActivityIndicatorRenderer.cs" />
     <Compile Include="Material\MaterialColors.cs" />
+    <Compile Include="ButtonElementManager.cs" />
+    <Compile Include="IButtonLayoutRenderer.cs" />
+    <Compile Include="ButtonLayoutManager.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
index 8c23153..807ab8e 100644
--- a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
@@ -105,5 +105,9 @@ namespace Xamarin.Forms.Platform.iOS
 					return DeviceOrientation.Other;
 			}
 		}
+
+		internal static bool IsHorizontal(this Button.ButtonContentLayout layout) =>
+			layout.Position == Button.ButtonContentLayout.ImagePosition.Left ||
+			layout.Position == Button.ButtonContentLayout.ImagePosition.Right;
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs b/Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs
new file mode 100644
index 0000000..a18d58d
--- /dev/null
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs
@@ -0,0 +1,353 @@
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using CoreGraphics;
+using UIKit;
+
+namespace Xamarin.Forms.Platform.iOS
+{
+	// TODO: The entire layout system. iOS buttons were not designed for
+	//       anything but image left, text right, single line layouts.
+
+	public class ButtonLayoutManager : IDisposable
+	{
+		bool _disposed;
+		IButtonLayoutRenderer _renderer;
+		Button _element;
+		bool _preserveInitialPadding;
+		bool _spacingAdjustsPadding;
+		bool _borderAdjustsPadding;
+		bool _collapseHorizontalPadding;
+
+		UIEdgeInsets? _defaultImageInsets;
+		UIEdgeInsets? _defaultTitleInsets;
+		UIEdgeInsets? _defaultContentInsets;
+
+		UIEdgeInsets _paddingAdjustments = new UIEdgeInsets();
+
+		public ButtonLayoutManager(IButtonLayoutRenderer renderer,
+			bool preserveInitialPadding = false,
+			bool spacingAdjustsPadding = true,
+			bool borderAdjustsPadding = false,
+			bool collapseHorizontalPadding = false)
+		{
+			_renderer = renderer ?? throw new ArgumentNullException(nameof(renderer));
+			_renderer.ElementChanged += OnElementChanged;
+			_preserveInitialPadding = preserveInitialPadding;
+			_spacingAdjustsPadding = spacingAdjustsPadding;
+			_borderAdjustsPadding = borderAdjustsPadding;
+			_collapseHorizontalPadding = collapseHorizontalPadding;
+
+			ImageElementManager.Init(renderer.ImageVisualElementRenderer);
+		}
+
+		UIButton Control => _renderer?.Control;
+
+		IImageVisualElementRenderer ImageVisualElementRenderer => _renderer?.ImageVisualElementRenderer;
+
+		public void Dispose()
+		{
+			Dispose(true);
+		}
+
+		protected virtual void Dispose(bool disposing)
+		{
+			if (!_disposed)
+			{
+				if (disposing)
+				{
+					if (_renderer != null)
+					{
+						var imageRenderer = ImageVisualElementRenderer;
+						if (imageRenderer != null)
+							ImageElementManager.Dispose(imageRenderer);
+
+						_renderer.ElementChanged -= OnElementChanged;
+						_renderer = null;
+					}
+				}
+				_disposed = true;
+			}
+		}
+
+		public CGSize SizeThatFits(CGSize size, CGSize measured)
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return measured;
+
+			var control = Control;
+			if (control == null)
+				return measured;
+
+			var minHeight = _renderer.MinimumHeight;
+			if (measured.Height < minHeight)
+				measured.Height = minHeight;
+
+			return measured;
+		}
+
+		public void Update()
+		{
+			UpdatePadding();
+			_ = UpdateImageAsync();
+			UpdateText();
+			UpdateEdgeInsets();
+		}
+
+		public void SetImage(UIImage image)
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			var control = Control;
+			if (control == null)
+				return;
+
+			if (image != null)
+			{
+				control.SetImage(image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal), UIControlState.Normal);
+				control.ImageView.ContentMode = UIViewContentMode.ScaleAspectFit;
+			}
+			else
+			{
+				control.SetImage(null, UIControlState.Normal);
+			}
+
+			UpdateEdgeInsets();
+		}
+
+		void OnElementChanged(object sender, ElementChangedEventArgs<Button> e)
+		{
+			if (_element != null)
+			{
+				_element.PropertyChanged -= OnElementPropertyChanged;
+				_element = null;
+			}
+
+			if (e.NewElement is Button button)
+			{
+				_element = button;
+				_element.PropertyChanged += OnElementPropertyChanged;
+			}
+
+			Update();
+		}
+
+		void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			if (e.PropertyName == Button.PaddingProperty.PropertyName)
+				UpdatePadding();
+			else if (e.PropertyName == Button.ImageProperty.PropertyName)
+				_ = UpdateImageAsync();
+			else if (e.PropertyName == Button.TextProperty.PropertyName)
+				UpdateText();
+			else if (e.PropertyName == Button.ContentLayoutProperty.PropertyName)
+				UpdateEdgeInsets();
+			else if (e.PropertyName == Button.BorderWidthProperty.PropertyName && _borderAdjustsPadding)
+				UpdateEdgeInsets();
+		}
+
+		void UpdateText()
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			var control = Control;
+			if (control == null)
+				return;
+
+			control.SetTitle(_element.Text, UIControlState.Normal);
+
+			UpdateEdgeInsets();
+		}
+
+		async Task UpdateImageAsync()
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			var imageRenderer = ImageVisualElementRenderer;
+			if (imageRenderer == null)
+				return;
+
+			try
+			{
+				await ImageElementManager.SetImage(imageRenderer, _element);
+			}
+			catch (Exception ex)
+			{
+				Internals.Log.Warning(nameof(ImageRenderer), "Error loading image: {0}", ex);
+			}
+		}
+
+		void UpdatePadding()
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			var control = Control;
+			if (control == null)
+				return;
+
+			EnsureDefaultInsets();
+
+			control.ContentEdgeInsets = GetPaddingInsets(_paddingAdjustments);
+		}
+
+		UIEdgeInsets GetPaddingInsets(UIEdgeInsets adjustments = default(UIEdgeInsets))
+		{
+			var defaultPadding = _preserveInitialPadding && _defaultContentInsets.HasValue
+				? _defaultContentInsets.Value
+				: new UIEdgeInsets();
+
+			return new UIEdgeInsets(
+				(nfloat)_element.Padding.Top + defaultPadding.Top + adjustments.Top,
+				(nfloat)_element.Padding.Left + defaultPadding.Left + adjustments.Left,
+				(nfloat)_element.Padding.Bottom + defaultPadding.Bottom + adjustments.Bottom,
+				(nfloat)_element.Padding.Right + defaultPadding.Right + adjustments.Right);
+		}
+
+		void EnsureDefaultInsets()
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			var control = Control;
+			if (control == null)
+				return;
+
+			if (_defaultImageInsets == null)
+				_defaultImageInsets = control.ImageEdgeInsets;
+			if (_defaultTitleInsets == null)
+				_defaultTitleInsets = control.TitleEdgeInsets;
+			if (_defaultContentInsets == null)
+				_defaultContentInsets = control.ContentEdgeInsets;
+		}
+
+		void UpdateEdgeInsets()
+		{
+			if (_disposed || _renderer == null || _element == null)
+				return;
+
+			var control = Control;
+			if (control == null)
+				return;
+
+			EnsureDefaultInsets();
+
+			_paddingAdjustments = new UIEdgeInsets();
+
+			var imageInsets = new UIEdgeInsets();
+			var titleInsets = new UIEdgeInsets();
+
+			// adjust for the border
+			if (_borderAdjustsPadding && _element is IBorderElement borderElement && borderElement.IsBorderWidthSet() && borderElement.BorderWidth != borderElement.BorderWidthDefaultValue)
+			{
+				var width = (nfloat)_element.BorderWidth;
+				_paddingAdjustments.Top += width;
+				_paddingAdjustments.Bottom += width;
+				_paddingAdjustments.Left += width;
+				_paddingAdjustments.Right += width;
+			}
+
+			var layout = _element.ContentLayout;
+
+			var spacing = (nfloat)layout.Spacing;
+			var halfSpacing = spacing / 2;
+
+			var image = control.CurrentImage;
+			if (image != null && !string.IsNullOrEmpty(control.CurrentTitle))
+			{
+				// TODO: Do not use the title label as it is not yet updated and
+				//       if we move the image, then we technically have more
+				//       space and will require a new laoyt pass.
+
+				var titleRect = control.TitleLabel.Bounds.Size;
+
+				var titleWidth = titleRect.Width;
+				var titleHeight = titleRect.Height;
+				var imageWidth = image.Size.Width;
+				var imageHeight = image.Size.Height;
+
+				// adjust the padding for the spacing
+				if (layout.IsHorizontal())
+				{
+					var adjustment = _spacingAdjustsPadding ? halfSpacing * 2 : halfSpacing;
+					_paddingAdjustments.Left += adjustment;
+					_paddingAdjustments.Right += adjustment;
+				}
+				else
+				{
+					var adjustment = _spacingAdjustsPadding ? halfSpacing * 2 : halfSpacing;
+
+					_paddingAdjustments.Top += adjustment;
+					_paddingAdjustments.Bottom += adjustment;
+				}
+
+				// move the images according to the layout
+				if (layout.Position == Button.ButtonContentLayout.ImagePosition.Left)
+				{
+					// add a bit of spacing
+					imageInsets.Left -= halfSpacing;
+					imageInsets.Right += halfSpacing;
+					titleInsets.Left += halfSpacing;
+					titleInsets.Right -= halfSpacing;
+				}
+				else if (layout.Position == Button.ButtonContentLayout.ImagePosition.Right)
+				{
+					// swap the elements and add spacing
+					imageInsets.Left += titleWidth + halfSpacing;
+					imageInsets.Right -= titleWidth + halfSpacing;
+					titleInsets.Left -= imageWidth + halfSpacing;
+					titleInsets.Right += imageWidth + halfSpacing;
+				}
+				else
+				{
+					// we will move the image and title vertically
+					var imageVertical = (titleHeight / 2) + halfSpacing;
+					var titleVertical = (imageHeight / 2) + halfSpacing;
+
+					// the width will be different now that the image is no longer next to the text
+					nfloat horizontalAdjustment = 0;
+					if (_collapseHorizontalPadding)
+						horizontalAdjustment = (nfloat)(titleWidth + imageWidth - Math.Max(titleWidth, imageWidth)) / 2;
+					_paddingAdjustments.Left -= horizontalAdjustment;
+					_paddingAdjustments.Right -= horizontalAdjustment;
+
+					// the height will also be different
+					var verticalAdjustment = (nfloat)Math.Min(imageVertical, titleVertical);
+					_paddingAdjustments.Top += verticalAdjustment;
+					_paddingAdjustments.Bottom += verticalAdjustment;
+
+					// if the image is at the bottom, swap the direction
+					if (layout.Position == Button.ButtonContentLayout.ImagePosition.Bottom)
+					{
+						imageVertical = -imageVertical;
+						titleVertical = -titleVertical;
+					}
+
+					// move the image and title vertically
+					imageInsets.Top -= imageVertical;
+					imageInsets.Bottom += imageVertical;
+					titleInsets.Top += titleVertical;
+					titleInsets.Bottom -= titleVertical;
+
+					// center the elements horizontally
+					var imageHorizontal = titleWidth / 2;
+					var titleHorizontal = imageWidth / 2;
+					imageInsets.Left += imageHorizontal;
+					imageInsets.Right -= imageHorizontal;
+					titleInsets.Left -= titleHorizontal;
+					titleInsets.Right += titleHorizontal;
+				}
+			}
+
+			UpdatePadding();
+			control.ImageEdgeInsets = imageInsets;
+			control.TitleEdgeInsets = titleInsets;
+		}
+	}
+}
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
index a0168ea..3ab36a9 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
@@ -1,24 +1,25 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using Foundation;
 using UIKit;
+using Xamarin.Forms.Internals;
 using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+using Specifics = Xamarin.Forms.PlatformConfiguration.iOSSpecific;
 using SizeF = CoreGraphics.CGSize;
 
 namespace Xamarin.Forms.Platform.iOS
 {
-	public class ButtonRenderer : ViewRenderer<Button, UIButton>, IImageVisualElementRenderer
+	public class ButtonRenderer : ViewRenderer<Button, UIButton>, IImageVisualElementRenderer, IButtonLayoutRenderer
 	{
 		bool _isDisposed;
 		UIColor _buttonTextColorDefaultDisabled;
 		UIColor _buttonTextColorDefaultHighlighted;
 		UIColor _buttonTextColorDefaultNormal;
 		bool _useLegacyColorManagement;
-		bool _titleChanged;
-		SizeF _titleSize;
-		UIEdgeInsets _paddingDelta = new UIEdgeInsets();
+
+		ButtonLayoutManager _buttonLayoutManager;
 
 		// This looks like it should be a const under iOS Classic,
 		// but that doesn't work under iOS 
@@ -31,22 +32,20 @@ namespace Xamarin.Forms.Platform.iOS
 
 		public bool IsDisposed => _isDisposed;
 
-		public ButtonRenderer() : base()
+		IImageVisualElementRenderer IButtonLayoutRenderer.ImageVisualElementRenderer => this;
+		nfloat IButtonLayoutRenderer.MinimumHeight => _minimumButtonHeight;
+
+		public ButtonRenderer()
 		{
 			BorderElementManager.Init(this);
-			ImageElementManager.Init(this);
+
+			_buttonLayoutManager = new ButtonLayoutManager(this);
 		}
 
 		public override SizeF SizeThatFits(SizeF size)
 		{
-			var result = base.SizeThatFits(size);
-
-			if (result.Height < _minimumButtonHeight)
-			{
-				result.Height = _minimumButtonHeight;
-			}
-
-			return result;
+			var measured = base.SizeThatFits(size);
+			return _buttonLayoutManager?.SizeThatFits(size, measured) ?? measured;
 		}
 
 		protected override void Dispose(bool disposing)
@@ -58,7 +57,8 @@ namespace Xamarin.Forms.Platform.iOS
 				Control.TouchUpInside -= OnButtonTouchUpInside;
 				Control.TouchDown -= OnButtonTouchDown;
 				BorderElementManager.Dispose(this);
-				ImageElementManager.Dispose(this);
+				_buttonLayoutManager?.Dispose();
+				_buttonLayoutManager = null;
 			}
 
 			_isDisposed = true;
@@ -90,11 +90,9 @@ namespace Xamarin.Forms.Platform.iOS
 					Control.TouchDown += OnButtonTouchDown;
 				}
 
-				UpdateText();
 				UpdateFont();
-				UpdateImage();
 				UpdateTextColor();
-				UpdatePadding();
+				_buttonLayoutManager?.Update();
 			}
 		}
 
@@ -107,16 +105,10 @@ namespace Xamarin.Forms.Platform.iOS
 		{
 			base.OnElementPropertyChanged(sender, e);
 
-			if (e.PropertyName == Button.TextProperty.PropertyName)
-				UpdateText();
-			else if (e.PropertyName == Button.TextColorProperty.PropertyName)
+			if (e.PropertyName == Button.TextColorProperty.PropertyName)
 				UpdateTextColor();
 			else if (e.PropertyName == Button.FontProperty.PropertyName)
 				UpdateFont();
-			else if (e.PropertyName == Button.ImageProperty.PropertyName)
-				UpdateImage();
-			else if (e.PropertyName == Button.PaddingProperty.PropertyName)
-				UpdatePadding();
 		}
 
 		protected override void SetAccessibilityLabel()
@@ -159,47 +151,10 @@ namespace Xamarin.Forms.Platform.iOS
 			Control.TitleLabel.Font = Element.ToUIFont();
 		}
 
-		async void UpdateImage()
-		{
-			try
-			{
-				await ImageElementManager.SetImage(this, Element);
-			}
-			catch (Exception ex)
-			{
-				Internals.Log.Warning(nameof(ImageRenderer), "Error loading image: {0}", ex);
-			}
-		}
-
-		public void SetImage(UIImage image)
-		{
-			if (image != null)
-			{
-				UIButton button = Control;
-				button.SetImage(image.ImageWithRenderingMode(UIImageRenderingMode.AlwaysOriginal), UIControlState.Normal);
-				button.ImageView.ContentMode = UIViewContentMode.ScaleAspectFit;
-				ComputeEdgeInsets(Control, Element.ContentLayout);
-			}
-			else
-			{
-				Control.SetImage(null, UIControlState.Normal);
-				ClearEdgeInsets(Control);
-			}
-		}
+		public void SetImage(UIImage image) => _buttonLayoutManager.SetImage(image);
 
 		public UIImageView GetImage() => Control?.ImageView;
 
-		void UpdateText()
-		{
-			var newText = Element.Text;
-
-			if (Control.Title(UIControlState.Normal) != newText)
-			{
-				Control.SetTitle(Element.Text, UIControlState.Normal);
-				_titleChanged = true;
-			}
-		}
-
 		void UpdateTextColor()
 		{
 			if (Element.TextColor == Color.Default)
@@ -219,89 +174,5 @@ namespace Xamarin.Forms.Platform.iOS
 				Control.TintColor = color;
 			}
 		}
-
-		void UpdatePadding(UIButton button = null)
-		{
-			var uiElement = button ?? Control;
-			if (uiElement == null)
-				return;
-			uiElement.ContentEdgeInsets = new UIEdgeInsets(
-				(float)(Element.Padding.Top + _paddingDelta.Top),
-				(float)(Element.Padding.Left + _paddingDelta.Left),
-				(float)(Element.Padding.Bottom + _paddingDelta.Bottom),
-				(float)(Element.Padding.Right + _paddingDelta.Right)
-			);
-		}
-
-		void UpdateContentEdge(UIButton button, UIEdgeInsets? delta = null)
-		{
-			_paddingDelta = delta ?? new UIEdgeInsets ();
-			UpdatePadding(button);
-		}
-
-		void ClearEdgeInsets(UIButton button)
-		{
-			if (button == null)
-				return;
-
-			Control.ImageEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
-			Control.TitleEdgeInsets = new UIEdgeInsets(0, 0, 0, 0);
-			UpdateContentEdge (Control);
-		}
-
-		void ComputeEdgeInsets(UIButton button, Button.ButtonContentLayout layout)
-		{
-			if (button?.ImageView?.Image == null || string.IsNullOrEmpty(button.TitleLabel?.Text))
-				return;
-
-			var position = layout.Position;
-			var spacing = (nfloat)(layout.Spacing / 2);
-
-			if (position == Button.ButtonContentLayout.ImagePosition.Left)
-			{
-				button.ImageEdgeInsets = new UIEdgeInsets(0, -spacing, 0, spacing);
-				button.TitleEdgeInsets = new UIEdgeInsets(0, spacing, 0, -spacing);
-				UpdateContentEdge (button, new UIEdgeInsets(0, 2 * spacing, 0, 2 * spacing));
-				return;
-			}
-
-			if (_titleChanged)
-			{
-				var stringToMeasure = new NSString(button.TitleLabel.Text);
-				UIStringAttributes attribs = new UIStringAttributes { Font = button.TitleLabel.Font };
-				_titleSize = stringToMeasure.GetSizeUsingAttributes(attribs);
-				_titleChanged = false;
-			}
-
-			var labelWidth = _titleSize.Width;
-			var imageWidth = button.ImageView.Image.Size.Width;
-
-			if (position == Button.ButtonContentLayout.ImagePosition.Right)
-			{
-				button.ImageEdgeInsets = new UIEdgeInsets(0, labelWidth + spacing, 0, -labelWidth - spacing);
-				button.TitleEdgeInsets = new UIEdgeInsets(0, -imageWidth - spacing, 0, imageWidth + spacing);
-				UpdateContentEdge (button, new UIEdgeInsets(0, 2 * spacing, 0, 2 * spacing));
-				return;
-			}
-
-			var imageVertOffset = (_titleSize.Height / 2);
-			var titleVertOffset = (button.ImageView.Image.Size.Height / 2);
-
-			var edgeOffset = (float)Math.Min(imageVertOffset, titleVertOffset);
-
-			UpdateContentEdge (button, new UIEdgeInsets (edgeOffset, 0, edgeOffset, 0));
-
-			var horizontalImageOffset = labelWidth / 2;
-			var horizontalTitleOffset = imageWidth / 2;
-
-			if (position == Button.ButtonContentLayout.ImagePosition.Bottom)
-			{
-				imageVertOffset = -imageVertOffset;
-				titleVertOffset = -titleVertOffset;
-			}
-
-			button.ImageEdgeInsets = new UIEdgeInsets(-imageVertOffset, horizontalImageOffset, imageVertOffset, -horizontalImageOffset);
-			button.TitleEdgeInsets = new UIEdgeInsets(titleVertOffset, -horizontalTitleOffset, -titleVertOffset, horizontalTitleOffset);
-		}
 	}
 }
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs
new file mode 100644
index 0000000..0116801
--- /dev/null
+++ b/Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs
@@ -0,0 +1,14 @@
+using System;
+using UIKit;
+
+namespace Xamarin.Forms.Platform.iOS
+{
+	public interface IButtonLayoutRenderer
+	{
+		UIButton Control { get; }
+		Button Element { get; }
+		IImageVisualElementRenderer ImageVisualElementRenderer { get; }
+		nfloat MinimumHeight { get; }
+		event EventHandler<ElementChangedEventArgs<Button>> ElementChanged;
+	}
+}
diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
index 03bc825..74ed07e 100644
--- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
+++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
@@ -208,6 +208,8 @@
     <Compile Include="NativeValueConverterService.cs" />
     <Compile Include="NativeBindingService.cs" />
     <Compile Include="Extensions\AccessibilityExtensions.cs" />
+    <Compile Include="Renderers\ButtonLayoutManager.cs" />
+    <Compile Include="Renderers\IButtonLayoutRenderer.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\StringResources.ar.resx" />
-- 
2.7.4