diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs
index 3a7f7d3b0c8..d846da9c067 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/CheckBoxStandardAdapter.cs
@@ -89,7 +89,7 @@ internal override Size GetPreferredSizeCore(Size proposedSize)
     {
         if (Control.Appearance == Appearance.Button)
         {
-            ButtonStandardAdapter adapter = new(Control);
+            ButtonBaseAdapter adapter = DarkModeAdapterFactory.CreateStandardAdapter(Control);
             return adapter.GetPreferredSizeCore(proposedSize);
         }
         else
@@ -105,9 +105,9 @@ internal override Size GetPreferredSizeCore(Size proposedSize)
         }
     }
 
-    private new ButtonStandardAdapter ButtonAdapter => (ButtonStandardAdapter)base.ButtonAdapter;
+    private new ButtonBaseAdapter ButtonAdapter => base.ButtonAdapter;
 
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonStandardAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateStandardAdapter(Control);
 
     protected override LayoutOptions Layout(PaintEventArgs e)
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs
index 0181286c263..4a75be1ebf2 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonStandardAdapter.cs
@@ -50,9 +50,9 @@ internal override void PaintOver(PaintEventArgs e, CheckState state)
         }
     }
 
-    private new ButtonStandardAdapter ButtonAdapter => (ButtonStandardAdapter)base.ButtonAdapter;
+    private new ButtonBaseAdapter ButtonAdapter => base.ButtonAdapter;
 
-    protected override ButtonBaseAdapter CreateButtonAdapter() => new ButtonStandardAdapter(Control);
+    protected override ButtonBaseAdapter CreateButtonAdapter() => DarkModeAdapterFactory.CreateStandardAdapter(Control);
 
     protected override LayoutOptions Layout(PaintEventArgs e)
     {
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
index 57526b2644b..e3139311bca 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/CheckBox.cs
@@ -96,17 +96,7 @@ public Appearance Appearance
         }
     }
 
-    private protected override bool OwnerDraw =>
-            // We want NO owner draw ONLY when we're
-            // * In Dark Mode
-            // * When _then_ the Appearance is Button
-            // * But then ONLY when we're rendering with FlatStyle.Standard
-            //   (because that would let us usually let us draw with the VisualStyleRenderers,
-            //   which cause HighDPI issues in Dark Mode).
-            (!Application.IsDarkModeEnabled
-                || Appearance != Appearance.Button
-                || FlatStyle != FlatStyle.Standard)
-                && base.OwnerDraw;
+    private protected override bool OwnerDraw => base.OwnerDraw;
 
     [SRCategory(nameof(SR.CatPropertyChanged))]
     [SRDescription(nameof(SR.CheckBoxOnAppearanceChangedDescr))]
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/RadioButton.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/RadioButton.cs
index a6674f1ea69..f5c190832bc 100644
--- a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/RadioButton.cs
+++ b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/RadioButton.cs
@@ -173,18 +173,7 @@ public bool Checked
         }
     }
 
-    private protected override bool OwnerDraw =>
-        // Order is key here - do NOT change!
-        // We want NO owner draw ONLY when we're
-        // * in Dark Mode
-        // * when _then_ the Appearance is Button
-        // * but then ONLY when we're rendering with FlatStyle.Standard
-        //   (because that would let us usually let us draw with the VisualStyleRenderers,
-        //   which cause HighDPI issues in Dark Mode).
-        (!Application.IsDarkModeEnabled
-            || Appearance != Appearance.Button
-            || FlatStyle != FlatStyle.Standard)
-            && base.OwnerDraw;
+    private protected override bool OwnerDraw => base.OwnerDraw;
 
     /// <hideinheritance/>
     [Browsable(false)]