diff --git a/res/layout/display_topology_preference.xml b/res/layout/display_topology_preference.xml
index 9f2805d0e83..add84b6b235 100644
--- a/res/layout/display_topology_preference.xml
+++ b/res/layout/display_topology_preference.xml
@@ -14,13 +14,19 @@
      limitations under the License.
 -->
 
+<!-- TODO(b/396116157): I cannot find the correct src of ImageView to set to
+     match the other preference items. I tried
+     @drawable/android:selectable_item_background but this is private so will
+     not compile. It should match the other items so that theme migration will
+     switch to the correct final color. -->
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/display_topology_pane_holder"
     android:importantForAccessibility="no"
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:paddingHorizontal="@dimen/display_topology_pane_margin"
+    android:layout_marginVertical="@dimen/display_topology_pane_vertical_margin"
+    android:layout_marginHorizontal="@dimen/display_topology_pane_margin"
     android:orientation="horizontal">
     <ImageView
         android:importantForAccessibility="no"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0e88e265867..ddce9e6a9df 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -552,6 +552,7 @@
 
     <!-- Connected displays -->
     <dimen name="display_topology_pane_margin">24dp</dimen>
+    <dimen name="display_topology_pane_vertical_margin">24dp</dimen>
     <dimen name="display_block_padding">5dp</dimen>
     <dimen name="display_block_highlight_width">2dp</dimen>
     <dimen name="display_block_corner_radius">10dp</dimen>
diff --git a/src/com/android/settings/connecteddevice/display/DisplayTopologyPreference.kt b/src/com/android/settings/connecteddevice/display/DisplayTopologyPreference.kt
index 42e633f62e7..7894a7e6c0d 100644
--- a/src/com/android/settings/connecteddevice/display/DisplayTopologyPreference.kt
+++ b/src/com/android/settings/connecteddevice/display/DisplayTopologyPreference.kt
@@ -16,9 +16,10 @@
 
 package com.android.settings.connecteddevice.display
 
-import android.app.WallpaperManager
 import com.android.settings.R
+import com.android.settingslib.widget.GroupSectionDividerMixin
 
+import android.app.WallpaperManager
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.PointF
@@ -45,7 +46,7 @@ import kotlin.math.abs
  * when there is one or more extended display attached.
  */
 class DisplayTopologyPreference(context : Context)
-        : Preference(context), ViewTreeObserver.OnGlobalLayoutListener {
+        : Preference(context), ViewTreeObserver.OnGlobalLayoutListener, GroupSectionDividerMixin {
     @VisibleForTesting lateinit var mPaneContent : FrameLayout
     @VisibleForTesting lateinit var mPaneHolder : FrameLayout
     @VisibleForTesting lateinit var mTopologyHint : TextView
@@ -82,6 +83,8 @@ class DisplayTopologyPreference(context : Context)
 
         isPersistent = false
 
+        isCopyingEnabled = false
+
         injector = Injector(context)
     }