diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml
index ad3faf02592f..12a34f4c5ae5 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml
@@ -4,39 +4,321 @@
              x:Class="Maui.Controls.Sample.Issues.Issue24414"
              Title="Issue24414">
 
-    <Grid RowDefinitions="Auto,*,*" RowSpacing="24">
-      <Label Text="Shadows" AutomationId="WaitForStubControl" />
+    <Grid RowDefinitions="Auto,*,*,*,*" ColumnDefinitions="*,*,*,*" RowSpacing="6" ColumnSpacing="6" Padding="16">
+      <Label x:Name="TheLabel" AutomationId="WaitForStubControl" Grid.ColumnSpan="4">
+        <Label.GestureRecognizers>
+          <TapGestureRecognizer Tapped="OnTapGestureRecognizerTapped"/>
+        </Label.GestureRecognizers>
+      </Label>
+        
+      <!-- Test solid black shadows with offsets and opacity -->
       <Border Grid.Row="1"
-              HeightRequest="248"
-              WidthRequest="248"
+              HeightRequest="72"
+              WidthRequest="72"
               VerticalOptions="Center"
               HorizontalOptions="Center"
-              StrokeShape="{RoundRectangle CornerRadius=24}"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
               Stroke="Black"
               Padding="24" />
       <Border Grid.Row="1"
-              HeightRequest="200"
-              WidthRequest="200"
+              HeightRequest="48"
+              WidthRequest="48"
               VerticalOptions="Center"
               HorizontalOptions="Center"
-              StrokeShape="{RoundRectangle CornerRadius=24}"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
               Background="LightGreen"
               Shadow="{Shadow Brush=Black, Offset='0,0', Radius=24, Opacity=1}" />
+
+      <Border Grid.Row="1"
+              Grid.Column="1"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="1"
+              Grid.Column="1"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen"
+              Shadow="{Shadow Brush=Black, Offset='24,24', Radius=24, Opacity=1}" />
+
+      <Border Grid.Row="1"
+              Grid.Column="2"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="1"
+              Grid.Column="2"
+              HeightRequest="48"
+              WidthRequest="48"
+              Margin="0,0,-16,-16"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen"
+              Shadow="{Shadow Brush=Black, Offset='-24,-24', Radius=12, Opacity=1}" />
+
+      <Border Grid.Row="1"
+              Grid.Column="3"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="1"
+              Grid.Column="3"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen"
+              Shadow="{Shadow Brush=Black, Offset='-12,-12', Radius=12, Opacity=.5}" />
+
+      <!-- Test different brush shadows with offsets and opacity -->
       <Border Grid.Row="2"
-              HeightRequest="248"
-              WidthRequest="248"
+              HeightRequest="72"
+              WidthRequest="72"
               VerticalOptions="Center"
               HorizontalOptions="Center"
-              StrokeShape="{RoundRectangle CornerRadius=24}"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
               Stroke="Black"
               Padding="24" />
       <Border Grid.Row="2"
-              HeightRequest="200"
-              WidthRequest="200"
+              HeightRequest="48"
+              WidthRequest="48"
               VerticalOptions="Center"
               HorizontalOptions="Center"
-              StrokeShape="{RoundRectangle CornerRadius=24}"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
               Background="LightGreen"
-              Shadow="{Shadow Brush=Black, Offset='24,24', Radius=24, Opacity=1}" />
+              Shadow="{Shadow Brush=SlateBlue, Offset='12,12', Radius=12, Opacity=0.8}" />
+
+      <Border Grid.Row="2"
+              Grid.Column="1"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="2"
+              Grid.Column="1"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen">
+          <Border.Shadow>
+            <Shadow Offset="12,12" Radius="12" Opacity="1">
+              <Shadow.Brush>
+                <LinearGradientBrush StartPoint="0,0"
+                                     EndPoint="1,0">
+                  <GradientStop Color="Orange" Offset="0.0"/>
+                  <GradientStop Color="DarkGreen" Offset="0.75"/>
+                </LinearGradientBrush>
+              </Shadow.Brush>
+            </Shadow>
+          </Border.Shadow>
+      </Border>
+
+      <Border Grid.Row="2"
+              Grid.Column="2"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="2"
+              Grid.Column="2"
+              HeightRequest="48"
+              WidthRequest="48"
+              Margin="0,0,-16,-16"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen">
+        <Border.Shadow>
+          <Shadow Offset="-24,-24" Radius="12" Opacity="1">
+            <Shadow.Brush>
+              <RadialGradientBrush Center="0.5,0.5"
+                                   Radius="0.75">
+                <GradientStop Color="Orange" Offset="0.0"/>
+                <GradientStop Color="DarkGreen" Offset="1"/>
+              </RadialGradientBrush>
+            </Shadow.Brush>
+          </Shadow>
+        </Border.Shadow>
+      </Border>
+
+      <Border Grid.Row="2"
+              Grid.Column="3"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="2"
+              Grid.Column="3"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen">
+        <Border.Shadow>
+          <Shadow Offset="-12,-12" Radius="12" Opacity=".5">
+            <Shadow.Brush>
+              <LinearGradientBrush StartPoint="0,0"
+                                   EndPoint="1,0">
+                <GradientStop Color="Orange" Offset="0.0"/>
+                <GradientStop Color="DarkGreen" Offset="0.75"/>
+              </LinearGradientBrush>
+            </Shadow.Brush>
+          </Shadow>
+        </Border.Shadow>
+      </Border>
+      
+      <!-- Test clipping -->
+      <Border Grid.Row="3"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="3"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen"
+              Shadow="{Shadow Brush=SlateBlue, Offset='12,12', Radius=12, Opacity=0.8}">
+        <Border.Clip>
+          <RoundRectangleGeometry Rect="-24,-24,60,60"
+                                  CornerRadius="24"/>
+        </Border.Clip>
+      </Border>
+
+      <Border Grid.Row="3"
+              Grid.Column="1"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="3"
+              Grid.Column="1"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen">
+        <Border.Shadow>
+          <Shadow Offset="-12,-12" Radius="12" Opacity="1">
+            <Shadow.Brush>
+              <LinearGradientBrush StartPoint="0,0"
+                                   EndPoint="1,0">
+                <GradientStop Color="Orange" Offset="0.0"/>
+                <GradientStop Color="DarkGreen" Offset="0.75"/>
+              </LinearGradientBrush>
+            </Shadow.Brush>
+          </Shadow>
+        </Border.Shadow>
+        <Border.Clip>
+          <RoundRectangleGeometry Rect="-24,-24,60,60"
+                                  CornerRadius="24"/>
+        </Border.Clip>
+      </Border>
+
+      <Border Grid.Row="3"
+              Grid.Column="2"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="3"
+              Grid.Column="2"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen">
+        <Border.Shadow>
+          <Shadow Offset="-12,-12" Radius="12" Opacity="1">
+            <Shadow.Brush>
+              <RadialGradientBrush Center="0.5,0.5"
+                                   Radius="0.75">
+                <GradientStop Color="Orange" Offset="0.0"/>
+                <GradientStop Color="DarkGreen" Offset="1"/>
+              </RadialGradientBrush>
+            </Shadow.Brush>
+          </Shadow>
+        </Border.Shadow>
+        <Border.Clip>
+          <RoundRectangleGeometry Rect="-24,-24,60,60"
+                                  CornerRadius="24"/>
+        </Border.Clip>
+      </Border>
+
+      <Border Grid.Row="3"
+              Grid.Column="3"
+              HeightRequest="72"
+              WidthRequest="72"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Stroke="Black"
+              Padding="24" />
+      <Border Grid.Row="3"
+              Grid.Column="3"
+              HeightRequest="48"
+              WidthRequest="48"
+              VerticalOptions="Center"
+              HorizontalOptions="Center"
+              StrokeShape="{RoundRectangle CornerRadius=12}"
+              Background="LightGreen">
+        <Border.Shadow>
+          <Shadow Offset="-12,-12" Radius="12" Opacity=".5">
+            <Shadow.Brush>
+              <LinearGradientBrush StartPoint="0,0"
+                                   EndPoint="1,0">
+                <GradientStop Color="Orange" Offset="0.0"/>
+                <GradientStop Color="DarkGreen" Offset="0.75"/>
+              </LinearGradientBrush>
+            </Shadow.Brush>
+          </Shadow>
+        </Border.Shadow>
+        <Border.Clip>
+          <RoundRectangleGeometry Rect="-24,-24,60,60"
+                                  CornerRadius="24"/>
+        </Border.Clip>
+      </Border>
     </Grid>
 </ContentPage>
diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs
index 472dd99ad849..4b92497e8534 100644
--- a/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs
+++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24414.xaml.cs
@@ -1,11 +1,54 @@
+using Microsoft.Maui.Controls.Shapes;
+
 namespace Maui.Controls.Sample.Issues;
 
 [Issue(IssueTracker.Github, 24414, "Shadows not rendering as expected on Android and iOS", PlatformAffected.Android | PlatformAffected.iOS)]
 
 public partial class Issue24414 : ContentPage
 {
+	int fn = 0;
 	public Issue24414()
 	{
 		InitializeComponent();
+		UpdateLabel();
+	}
+
+	private void OnTapGestureRecognizerTapped(object sender, EventArgs e)
+	{
+		var grid = (Grid)Content;
+		foreach (IView view in grid)
+		{
+			if (view is Border { Shadow: not null } border)
+			{
+				switch (fn)
+				{
+					case 0:
+						border.WidthRequest += 4;
+						border.HeightRequest += 4;
+						break;
+					case 1:
+						border.StrokeShape = new RoundRectangle { CornerRadius = border.WidthRequest };
+						break;
+					case 2:
+						border.Shadow.Radius -= 8;
+						break;
+				}
+			}
+		}
+
+		UpdateLabel();
+
+		++fn;
+	}
+
+	void UpdateLabel()
+	{
+		TheLabel.Text = fn switch
+		{
+			0 => "Tap to resize the border",
+			1 => "Tap to change the border shape",
+			2 => "Tap to change the shadow radius",
+			_ => "Done"
+		};
 	}
 }
diff --git a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformContentViewGroup.java b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformContentViewGroup.java
index 7e01c07e4ca0..b5844b64c5a4 100644
--- a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformContentViewGroup.java
+++ b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformContentViewGroup.java
@@ -24,14 +24,14 @@ public PlatformContentViewGroup(Context context, AttributeSet attrs, int defStyl
         super(context, attrs, defStyle, defStyleRes);
     }
 
-    private boolean hasClip;
+    private boolean hasClip = false;
 
     /**
      * Set by C#, determining if we need to call getClipPath()
      * Intentionally invalidates the view in case clip changed
      * @param hasClip
      */
-    protected final void setHasClip(boolean hasClip) {
+    protected void setHasClip(boolean hasClip) {
         this.hasClip = hasClip;
         invalidate();
     }
diff --git a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformPaintType.java b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformPaintType.java
new file mode 100644
index 000000000000..6ea47033d9a5
--- /dev/null
+++ b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformPaintType.java
@@ -0,0 +1,8 @@
+package com.microsoft.maui;
+
+public class PlatformPaintType {
+    public static final int NONE = 0;
+    public static final int SOLID = 1;
+    public static final int LINEAR = 2;
+    public static final int RADIAL = 3;
+}
diff --git a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java
index eeeb81a12306..6a6654e57230 100644
--- a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java
+++ b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/PlatformWrapperView.java
@@ -1,13 +1,26 @@
 package com.microsoft.maui;
 
 import android.content.Context;
+import android.os.Build;
+
+import android.graphics.BlurMaskFilter;
+import android.graphics.Color;
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
+import android.graphics.Shader;
+
 import android.view.View;
 
 import androidx.annotation.NonNull;
 
+import com.microsoft.maui.PlatformPaintType;
+
 public abstract class PlatformWrapperView extends PlatformContentViewGroup {
+
     public PlatformWrapperView(Context context) {
         super(context);
         this.viewBounds = new Rect();
@@ -16,15 +29,80 @@ public PlatformWrapperView(Context context) {
     }
 
     private final Rect viewBounds;
-    private boolean hasShadow;
 
-    /**
-     * Set by C#, determining if we need to call drawShadow()
-     * Intentionally invalidates the view in case shadow definition changed
-     * @param hasShadow
-     */
+    private Paint shadowPaint;
+    private Bitmap shadowBitmap;
+    private Canvas shadowCanvas;
+    private boolean shadowInvalidated = true;
+
+    private int paintType = PlatformPaintType.NONE;
+    private float offsetX = 0;
+    private float offsetY = 0;
+    private float radius = 0;
+    private int[] colors = new int[0];
+    private float[] positions = new float[0];
+    private float[] bounds = new float[0];
+
+    @Override
+    protected void setHasClip(boolean hasClip) {
+        super.setHasClip(hasClip);
+        shadowInvalidated = true;
+    }
+
     protected final void setHasShadow(boolean hasShadow) {
-        this.hasShadow = hasShadow;
+        // TODO: remove this method in .NET10
+    }
+
+    protected final void updateShadow(int paintType, float radius, float offsetX, float offsetY, int[] colors, float[] positions, float[] bounds) {
+        this.paintType = paintType;
+        this.radius = radius;
+        this.offsetX = offsetX;
+        this.offsetY = offsetY;
+        this.colors = colors;
+        this.positions = positions;
+        this.bounds = bounds;
+
+        if (paintType == PlatformPaintType.NONE) {
+            shadowPaint = null;
+            shadowCanvas = null;
+            if (shadowBitmap != null) {
+                shadowBitmap.recycle();
+                shadowBitmap = null;
+            }
+        } else {
+            shadowCanvas = new Canvas();
+            shadowPaint = new Paint();
+            shadowPaint.setAntiAlias(true);
+            shadowPaint.setDither(true);
+            shadowPaint.setFilterBitmap(true);
+            shadowPaint.setMaskFilter(new BlurMaskFilter(radius, BlurMaskFilter.Blur.NORMAL));
+            
+            if (paintType == PlatformPaintType.SOLID) {
+                shadowPaint.setColor(colors.length > 0 ? colors[0] : android.graphics.Color.BLACK);
+            }
+        }
+
+        shadowInvalidated = true;
+        invalidate();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        shadowInvalidated = true;
+        if (shadowBitmap != null) {
+            shadowBitmap.recycle();
+            shadowBitmap = null;
+        }
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        shadowInvalidated = shadowInvalidated || changed;
+    }
+
+    public void invalidateShadow() {
+        shadowInvalidated = true;
         invalidate();
     }
 
@@ -44,7 +122,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     @Override
     protected void dispatchDraw(Canvas canvas) {
         // Only call into C# if there is a Shadow
-        if (hasShadow) {
+        if (paintType != PlatformPaintType.NONE) {
             int viewWidth = viewBounds.width();
             int viewHeight = viewBounds.height();
             if (getChildCount() > 0)
@@ -55,17 +133,84 @@ protected void dispatchDraw(Canvas canvas) {
                 if (viewHeight == 0)
                     viewHeight = child.getMeasuredHeight();
             }
-            drawShadow(canvas, viewWidth, viewHeight);
+
+            if (viewWidth > 0 && viewHeight > 0) {
+                drawShadow(canvas, viewWidth, viewHeight);
+            }
         }
         super.dispatchDraw(canvas);
     }
 
-    /**
-     * Overridden in C#, for custom logic around shadows
-     * @param canvas
-     * @param viewWidth
-     * @param viewHeight
-     * @return
-     */
-    protected abstract void drawShadow(@NonNull Canvas canvas, int viewWidth, int viewHeight);
+    protected void drawShadow(@NonNull Canvas canvas, int viewWidth, int viewHeight) {
+        int bitmapWidth = viewHeight + 2 + (int)radius * 2 + Math.abs((int)offsetX) * 2;
+        int bitmapHeight = viewHeight + + 2 + (int)radius * 2 + Math.abs((int)offsetY) * 2;
+        int drawOriginX = (bitmapWidth - viewWidth) / 2;
+        int drawOriginY = (bitmapHeight - viewHeight) / 2;
+
+        if (shadowInvalidated) {
+            shadowInvalidated = false;
+
+            if (shadowBitmap != null) {
+                if (shadowBitmap.getWidth() == bitmapWidth && shadowBitmap.getHeight() == bitmapHeight) {
+                    shadowBitmap.eraseColor(Color.TRANSPARENT);
+                } else {
+                    shadowBitmap.recycle();
+                    shadowBitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888);
+                }
+            } else {
+                shadowBitmap = Bitmap.createBitmap(bitmapWidth, bitmapHeight, Bitmap.Config.ARGB_8888);
+            }
+
+            shadowCanvas.setBitmap(shadowBitmap);
+
+            // Create the local copy of all content to draw bitmap as a bottom layer of natural canvas.
+            shadowCanvas.save();
+            shadowCanvas.translate(drawOriginX, drawOriginY);
+            super.dispatchDraw(shadowCanvas);
+            shadowCanvas.restore();
+
+            // Get the alpha bounds of bitmap
+            Bitmap extractAlpha = shadowBitmap.extractAlpha();
+
+            // Clear the shadow canvas
+            shadowCanvas.drawColor(Color.BLACK, PorterDuff.Mode.CLEAR);
+
+            // Apply shader if needed
+            Shader shader = createShader(bitmapWidth, bitmapHeight);
+            if (shader != null) {
+                shadowPaint.setShader(shader);
+            }
+
+            shadowCanvas.drawBitmap(extractAlpha, offsetX, offsetY, shadowPaint);
+
+            extractAlpha.recycle();
+        }
+    
+        // Draw shadow rectangle
+        canvas.drawBitmap(shadowBitmap, -drawOriginX, -drawOriginY, shadowPaint);
+    }
+
+    private Shader createShader(int bitmapWidth, int bitmapHeight) {
+        Shader shader = null;
+
+        if (paintType == PlatformPaintType.LINEAR) {
+            shader = new android.graphics.LinearGradient(
+                bounds[0] * bitmapWidth, bounds[1] * bitmapHeight,  // Start point
+                bounds[2] * bitmapWidth, bounds[3] * bitmapHeight,  // End point
+                colors,
+                positions,
+                android.graphics.Shader.TileMode.CLAMP
+            );
+        } else if (paintType == PlatformPaintType.RADIAL) {
+            shader = new android.graphics.RadialGradient(
+                bounds[0] * bitmapWidth, bounds[1] * bitmapHeight,  // Center point
+                bounds[2] * Math.max(bitmapWidth, bitmapHeight),   // Radius
+                colors,
+                positions,
+                android.graphics.Shader.TileMode.CLAMP
+            );
+        }
+
+        return shader;
+    }
 }
diff --git a/src/Core/src/Platform/Android/StrokeExtensions.cs b/src/Core/src/Platform/Android/StrokeExtensions.cs
index 7eba548df6ee..90b211fa03f7 100644
--- a/src/Core/src/Platform/Android/StrokeExtensions.cs
+++ b/src/Core/src/Platform/Android/StrokeExtensions.cs
@@ -34,6 +34,8 @@ public static void UpdateStrokeShape(this AView platformView, IBorderStroke bord
 				return;
 
 			platformView.UpdateMauiDrawable(border, ref mauiDrawable);
+			// Make sure to invalidate the wrapper view so that the eventual shadow is redrawn
+			(platformView.Parent as WrapperView)?.InvalidateShadow();
 		}
 
 		public static void UpdateStroke(this AView platformView, IBorderStroke border)
diff --git a/src/Core/src/Platform/Android/WrapperView.cs b/src/Core/src/Platform/Android/WrapperView.cs
index 88939b7420b6..c04866794ae9 100644
--- a/src/Core/src/Platform/Android/WrapperView.cs
+++ b/src/Core/src/Platform/Android/WrapperView.cs
@@ -12,19 +12,10 @@ namespace Microsoft.Maui.Platform
 {
 	public partial class WrapperView : PlatformWrapperView
 	{
-		const int MaximumRadius = 100;
-
-		static readonly BlurMaskFilter.Blur BlurFilter = BlurMaskFilter.Blur.Normal;
-
 		APath _currentPath;
 		SizeF _lastPathSize;
 		bool _invalidateClip;
 
-		Bitmap _shadowBitmap;
-		Canvas _shadowCanvas;
-		Android.Graphics.Paint _shadowPaint;
-		bool _invalidateShadow;
-
 		AView _borderView;
 
 		public bool InputTransparent { get; set; }
@@ -34,19 +25,6 @@ public WrapperView(Context context)
 		{
 		}
 
-		protected override void OnDetachedFromWindow()
-		{
-			base.OnDetachedFromWindow();
-
-			_invalidateShadow = true;
-
-			if (_shadowBitmap != null)
-			{
-				_shadowBitmap.Recycle();
-				_shadowBitmap = null;
-			}
-		}
-
 		protected override void OnLayout(bool changed, int left, int top, int right, int bottom)
 		{
 			_borderView?.BringToFront();
@@ -57,20 +35,11 @@ protected override void OnLayout(bool changed, int left, int top, int right, int
 			var widthMeasureSpec = MeasureSpecMode.Exactly.MakeMeasureSpec(right - left);
 			var heightMeasureSpec = MeasureSpecMode.Exactly.MakeMeasureSpec(bottom - top);
 
-			_invalidateShadow = true;
 			child.Measure(widthMeasureSpec, heightMeasureSpec);
 			child.Layout(0, 0, child.MeasuredWidth, child.MeasuredHeight);
 			_borderView?.Layout(0, 0, child.MeasuredWidth, child.MeasuredHeight);
 		}
 
-		public override void RequestLayout()
-		{
-			// Redraw shadow (if exists)
-			_invalidateShadow = true;
-
-			base.RequestLayout();
-		}
-
 		public override bool DispatchTouchEvent(MotionEvent e)
 		{
 			if (InputTransparent)
@@ -83,19 +52,54 @@ public override bool DispatchTouchEvent(MotionEvent e)
 
 		partial void ClipChanged()
 		{
-			_invalidateClip = _invalidateShadow = true;
+			_invalidateClip = true;
 			SetHasClip(Clip is not null);
 		}
 
 		partial void ShadowChanged()
 		{
-			_invalidateShadow = true;
+			if (Shadow?.Paint is { } shadowPaint)
+			{
+				var shadowOpacity = Shadow.Opacity;
+				float radius = Context.ToPixels(Shadow.Radius);
+				float offsetX = Context.ToPixels(Shadow.Offset.X);
+				float offsetY = Context.ToPixels(Shadow.Offset.Y);
+				int paintType;
+				int[] colors;
+				float[] positions;
+				float[] bounds;
+				
+				switch (shadowPaint)
+				{
+					case LinearGradientPaint linearGradientPaint:
+						var linearGradientData = linearGradientPaint.GetGradientData(shadowOpacity);
+						paintType = PlatformPaintType.Linear;
+						colors = linearGradientData.Colors;
+						positions = linearGradientData.Offsets;
+						bounds = [linearGradientData.X1, linearGradientData.Y1, linearGradientData.X2, linearGradientData.Y2];
+						break;
+					case RadialGradientPaint radialGradientPaint:
+						var radialGradientData = radialGradientPaint.GetGradientData(shadowOpacity);
+						paintType = PlatformPaintType.Radial;
+						colors = radialGradientData.Colors;
+						positions = radialGradientData.Offsets;
+						bounds = [radialGradientData.CenterX, radialGradientData.CenterY, radialGradientData.Radius];
+						break;
+					case SolidPaint solidPaint:
+						paintType = PlatformPaintType.Solid;
+						colors = [solidPaint.Color.ToPlatform()];
+						positions = null;
+						bounds = null;
+						break;
+					default:
+						throw new NotSupportedException("Unsupported shadow paint type.");
+				}
 
-			bool hasShadow = Shadow?.Paint is not null;
-			SetHasShadow(hasShadow);
-			if (!hasShadow && _shadowBitmap is not null)
+				UpdateShadow(paintType, radius, offsetX, offsetY, colors, positions, bounds);
+			}
+			else
 			{
-				ClearShadowResources();
+				UpdateShadow(PlatformPaintType.None, 0, 0, 0, null, null, null);
 			}
 		}
 
@@ -135,131 +139,6 @@ protected override APath GetClipPath(int width, int height)
 			return _currentPath;
 		}
 
-		protected override void DrawShadow(Canvas canvas, int viewWidth, int viewHeight)
-		{
-			if (_shadowCanvas == null)
-				_shadowCanvas = new Canvas();
-
-			if (_shadowPaint == null)
-				_shadowPaint = new Android.Graphics.Paint
-				{
-					AntiAlias = true,
-					Dither = true,
-					FilterBitmap = true
-				};
-
-			Graphics.Color solidColor = null;
-
-			// If need to redraw shadow
-			if (_invalidateShadow)
-			{
-				// If bounds is zero
-				if (viewHeight != 0 && viewWidth != 0)
-				{
-					var bitmapHeight = viewHeight + MaximumRadius;
-					var bitmapWidth = viewWidth + MaximumRadius;
-
-					// Reset bitmap to bounds
-					_shadowBitmap = Bitmap.CreateBitmap(
-						bitmapWidth, bitmapHeight, Bitmap.Config.Argb8888
-					);
-
-					// Reset Canvas
-					_shadowCanvas.SetBitmap(_shadowBitmap);
-
-					_invalidateShadow = false;
-
-					// Create the local copy of all content to draw bitmap as a
-					// bottom layer of natural canvas.
-					ViewGroupDispatchDraw(_shadowCanvas);
-
-					// Get the alpha bounds of bitmap
-					Bitmap extractAlpha = _shadowBitmap.ExtractAlpha();
-
-					// Clear past content to draw shadow
-					_shadowCanvas.DrawColor(Android.Graphics.Color.Black, PorterDuff.Mode.Clear);
-
-					var shadowOpacity = (float)Shadow.Opacity;
-
-					if (Shadow.Paint is LinearGradientPaint linearGradientPaint)
-					{
-						var linearGradientShaderFactory = PaintExtensions.GetGradientShaderFactory(linearGradientPaint, shadowOpacity);
-						_shadowPaint.SetShader(linearGradientShaderFactory.Resize(bitmapWidth, bitmapHeight));
-					}
-					if (Shadow.Paint is RadialGradientPaint radialGradientPaint)
-					{
-						var radialGradientShaderFactory = PaintExtensions.GetGradientShaderFactory(radialGradientPaint, shadowOpacity);
-						_shadowPaint.SetShader(radialGradientShaderFactory.Resize(bitmapWidth, bitmapHeight));
-					}
-					if (Shadow.Paint is SolidPaint solidPaint)
-					{
-						solidColor = solidPaint.ToColor();
-#pragma warning disable CA1416 // https://github.com/xamarin/xamarin-android/issues/6962
-						_shadowPaint.Color = solidColor.WithAlpha(shadowOpacity).ToPlatform();
-#pragma warning restore CA1416
-					}
-
-					// Apply the shadow radius
-					var radius = Shadow.Radius;
-
-					if (radius <= 0)
-						radius = 0.01f;
-
-					if (radius > 100)
-						radius = MaximumRadius;
-
-					var context = Context;
-					_shadowPaint.SetMaskFilter(new BlurMaskFilter(context.ToPixels(radius), BlurFilter));
-
-					float shadowOffsetX = context.ToPixels(Shadow.Offset.X);
-					float shadowOffsetY = context.ToPixels(Shadow.Offset.Y);
-
-					if (Clip == null)
-					{
-						_shadowCanvas.DrawBitmap(extractAlpha, shadowOffsetX, shadowOffsetY, _shadowPaint);
-					}
-					else
-					{
-						var bounds = new Graphics.RectF(0, 0, canvas.Width, canvas.Height);
-						var density = context.GetDisplayDensity();
-						var path = Clip.PathForBounds(bounds)?.AsAndroidPath(scaleX: density, scaleY: density);
-
-						path.Offset(shadowOffsetX, shadowOffsetY);
-
-						_shadowCanvas.DrawPath(path, _shadowPaint);
-					}
-
-					// Recycle and clear extracted alpha
-					extractAlpha.Recycle();
-				}
-				else
-				{
-					// Create placeholder bitmap when size is zero and wait until new size coming up
-					_shadowBitmap = Bitmap.CreateBitmap(1, 1, Bitmap.Config.Rgb565!);
-				}
-			}
-
-			// Reset alpha to draw child with full alpha
-			if (solidColor != null)
-#pragma warning disable CA1416 // https://github.com/xamarin/xamarin-android/issues/6962
-				_shadowPaint.Color = solidColor.ToPlatform();
-#pragma warning restore CA1416
-
-			// Draw shadow bitmap
-			if (_shadowCanvas != null && _shadowBitmap != null && !_shadowBitmap.IsRecycled)
-				canvas.DrawBitmap(_shadowBitmap, 0.0F, 0.0F, _shadowPaint);
-		}
-
-		void ClearShadowResources()
-		{
-			_shadowCanvas?.Dispose();
-			_shadowPaint?.Dispose();
-			_shadowBitmap?.Dispose();
-			_shadowCanvas = null;
-			_shadowPaint = null;
-			_shadowBitmap = null;
-		}
-
 		public override ViewStates Visibility
 		{
 			get => base.Visibility;
@@ -330,4 +209,4 @@ void CleanupContainerView(AView containerView, Action clearWrapperView)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index b321ce001d0b..1a3ec107fb36 100644
--- a/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -53,6 +53,7 @@ Microsoft.Maui.Platform.MauiHybridWebViewClient.MauiHybridWebViewClient(Microsof
 Microsoft.Maui.Platform.MauiMaterialButton.MauiMaterialButton(Android.Content.Context! context, Android.Util.IAttributeSet? attrs, int defStyleAttr) -> void
 Microsoft.Maui.Platform.MauiMaterialButton.MauiMaterialButton(Android.Content.Context! context, Android.Util.IAttributeSet? attrs) -> void
 Microsoft.Maui.Platform.MauiMaterialButton.MauiMaterialButton(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
+Microsoft.Maui.PlatformWrapperView.UpdateShadow(int paintType, float radius, float offsetX, float offsetY, int[]? colors, float[]? positions, float[]? bounds) -> void
 Microsoft.Maui.TextAlignment.Justify = 3 -> Microsoft.Maui.TextAlignment
 Microsoft.Maui.WebProcessTerminatedEventArgs
 Microsoft.Maui.WebProcessTerminatedEventArgs.RenderProcessGoneDetail.get -> Android.Webkit.RenderProcessGoneDetail?
@@ -64,6 +65,7 @@ override Microsoft.Maui.Platform.MauiAppCompatEditText.OnSelectionChanged(int se
 override Microsoft.Maui.Platform.MauiHybridWebViewClient.Dispose(bool disposing) -> void
 override Microsoft.Maui.Platform.MauiHybridWebViewClient.ShouldInterceptRequest(Android.Webkit.WebView? view, Android.Webkit.IWebResourceRequest? request) -> Android.Webkit.WebResourceResponse?
 override Microsoft.Maui.Platform.MauiWebViewClient.OnRenderProcessGone(Android.Webkit.WebView? view, Android.Webkit.RenderProcessGoneDetail? detail) -> bool
+override Microsoft.Maui.PlatformWrapperView.OnLayout(bool changed, int left, int top, int right, int bottom) -> void
 static Microsoft.Maui.ElementHandlerExtensions.GetRequiredService<T>(this Microsoft.Maui.IElementHandler! handler, System.Type! type) -> T
 static Microsoft.Maui.ElementHandlerExtensions.GetRequiredService<T>(this Microsoft.Maui.IElementHandler! handler) -> T
 static Microsoft.Maui.ElementHandlerExtensions.GetService<T>(this Microsoft.Maui.IElementHandler! handler, System.Type! type) -> T?
@@ -82,3 +84,11 @@ static Microsoft.Maui.Keyboard.Password.get -> Microsoft.Maui.Keyboard!
 static Microsoft.Maui.Keyboard.Time.get -> Microsoft.Maui.Keyboard!
 static Microsoft.Maui.ViewExtensions.DisconnectHandlers(this Microsoft.Maui.IView! view) -> void
 override Microsoft.Maui.Handlers.BorderHandler.PlatformArrange(Microsoft.Maui.Graphics.Rect rect) -> void
+*REMOVED*override Microsoft.Maui.Platform.WrapperView.OnDetachedFromWindow() -> void
+*REMOVED*override Microsoft.Maui.Platform.WrapperView.RequestLayout() -> void
+virtual Microsoft.Maui.PlatformContentViewGroup.SetHasClip(bool hasClip) -> void
+*REMOVED*Microsoft.Maui.PlatformContentViewGroup.SetHasClip(bool hasClip) -> void
+virtual Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas! canvas, int viewWidth, int viewHeight) -> void
+virtual Microsoft.Maui.PlatformWrapperView.InvalidateShadow() -> void
+*REMOVED*~override Microsoft.Maui.Platform.WrapperView.DrawShadow(Android.Graphics.Canvas canvas, int viewWidth, int viewHeight) -> void
+*REMOVED*abstract Microsoft.Maui.PlatformWrapperView.DrawShadow(Android.Graphics.Canvas! p0, int p1, int p2) -> void
diff --git a/src/Core/src/maui.aar b/src/Core/src/maui.aar
index d27729afeb7c..18d60b7af557 100644
Binary files a/src/Core/src/maui.aar and b/src/Core/src/maui.aar differ