diff --git a/res/layout/vpn_app_management_preference.xml b/res/layout/vpn_app_management_preference.xml
new file mode 100644
index 00000000000..d1d4aa41170
--- /dev/null
+++ b/res/layout/vpn_app_management_preference.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2023 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+-->
+
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground">
+
+    <FrameLayout
+        android:id="@+id/icon_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <androidx.preference.internal.PreferenceImageView
+            android:id="@android:id/icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:maxWidth="48dp"
+            app:maxHeight="48dp" />
+    </FrameLayout>
+
+    <TextView android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        app:layout_constraintLeft_toRightOf="@android:id/icon_frame"
+        app:layout_constraintHeight="wrap_content_constrained"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal" />
+
+    <TextView android:id="@android:id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@android:id/title"
+        app:layout_constraintLeft_toLeftOf="@android:id/title"
+        app:layout_constraintHeight="wrap_content_constrained"
+        android:scrollbars="vertical"
+        android:layout_marginBottom="16dp"
+        android:textColor="?android:attr/textColorSecondary"
+        />
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c2622641423..5ee6365d925 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -194,16 +194,6 @@
         <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Small</item>
     </style>
 
-    <style name="vpn_app_management_version_title">
-        <item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="vpn_app_management_version_summary">
-        <item name="android:textAppearance">?android:attr/textAppearanceListItemSecondary</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    </style>
-
     <style name="TextAppearance" parent="android:TextAppearance.DeviceDefault"/>
 
     <style name="TextAppearance.info_label">
diff --git a/res/values/styles_preference.xml b/res/values/styles_preference.xml
index 5d162a8b8fe..10c7e695ddb 100644
--- a/res/values/styles_preference.xml
+++ b/res/values/styles_preference.xml
@@ -71,4 +71,8 @@
         <item name="android:layout">@layout/setup_preference</item>
     </style>
 
-</resources>
\ No newline at end of file
+    <style name="VpnAppManagementPreferenceStyle" parent="@style/PreferenceFragment.Material">
+        <item name="layout">@layout/vpn_app_management_preference</item>
+    </style>
+
+</resources>
diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
index adc441d8468..dffbbbe3116 100644
--- a/res/xml/vpn_app_management.xml
+++ b/res/xml/vpn_app_management.xml
@@ -15,24 +15,15 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
-        orderingFromXml="false"
-        >
-
-        <!-- To limit the size (in height) of version Preference displayed here,
-             maximum height of TextView need to be set programmingly.
-             Therefore, this Preference got removed from here and will be added
-             dynamically through source code.
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
 
         <Preference
-                android:order="0"
+                android:theme="@style/VpnAppManagementPreferenceStyle"
+                android:title="@string/vpn_version"
                 android:key="version"
-                android:textColor="?android:attr/textColorSecondary"
                 android:selectable="false"/>
-        -->
 
         <com.android.settingslib.RestrictedSwitchPreference
-                android:order="10"
                 android:key="always_on_vpn"
                 android:title="@string/vpn_menu_lockdown"
                 android:defaultValue="false"
@@ -42,7 +33,6 @@
                 settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
 
         <com.android.settingslib.RestrictedSwitchPreference
-                android:order="20"
                 android:key="lockdown_vpn"
                 android:title="@string/vpn_require_connection"
                 android:defaultValue="false"
@@ -52,7 +42,6 @@
                 settings:restrictedSwitchSummary="@string/disabled_by_admin_summary_text" />
 
         <com.android.settingslib.RestrictedPreference
-                android:order="30"
                 android:key="forget_vpn"
                 android:title="@string/vpn_forget_long"
                 android:icon="@drawable/ic_delete"
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index d2fa5fccbfc..0667f424d3e 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -34,13 +34,11 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
 
 import com.android.internal.net.VpnConfig;
 import com.android.internal.util.ArrayUtils;
@@ -81,6 +79,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
     private String mVpnLabel;
 
     // UI preference
+    private Preference mPreferenceVersion;
     private RestrictedSwitchPreference mPreferenceAlwaysOn;
     private RestrictedSwitchPreference mPreferenceLockdown;
     private RestrictedPreference mPreferenceForget;
@@ -126,6 +125,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
         mVpnManager = getContext().getSystemService(VpnManager.class);
         mFeatureProvider = FeatureFactory.getFactory(getContext()).getAdvancedVpnFeatureProvider();
 
+        mPreferenceVersion = findPreference(KEY_VERSION);
         mPreferenceAlwaysOn = (RestrictedSwitchPreference) findPreference(KEY_ALWAYS_ON_VPN);
         mPreferenceLockdown = (RestrictedSwitchPreference) findPreference(KEY_LOCKDOWN_VPN);
         mPreferenceForget = (RestrictedPreference) findPreference(KEY_FORGET_VPN);
@@ -141,52 +141,8 @@ public class AppManagementFragment extends SettingsPreferenceFragment
 
         boolean isInfoLoaded = loadInfo();
         if (isInfoLoaded) {
+            mPreferenceVersion.setSummary(mPackageInfo.versionName);
             updateUI();
-
-            Preference version = getPreferenceScreen().findPreference(KEY_VERSION);
-            if (version != null) {
-                // Version field has been added.
-                return;
-            }
-
-            /**
-             * Create version field at runtime, and set max height on the display area.
-             *
-             * When long length of text given within version field, a large text area
-             * might be created and inconvenient to the user (User need to scroll
-             * for a long time in order to get to the Preferences after this field.)
-             */
-            version = new Preference(getPrefContext()) {
-                @Override
-                public void onBindViewHolder(PreferenceViewHolder holder) {
-                    super.onBindViewHolder(holder);
-
-                    TextView titleView =
-                            (TextView) holder.findViewById(android.R.id.title);
-                    if (titleView != null) {
-                        titleView.setTextAppearance(R.style.vpn_app_management_version_title);
-                    }
-
-                    TextView summaryView =
-                            (TextView) holder.findViewById(android.R.id.summary);
-                    if (summaryView != null) {
-                        summaryView.setTextAppearance(R.style.vpn_app_management_version_summary);
-
-                        // Set max height in summary area.
-                        int versionMaxHeight = getListView().getHeight();
-                        summaryView.setMaxHeight(versionMaxHeight);
-                        summaryView.setVerticalScrollBarEnabled(false);
-                        summaryView.setHorizontallyScrolling(false);
-                    }
-                }
-            };
-            version.setOrder(0);            // Set order to 0 in order to be placed
-                                            // in front of other Preference(s).
-            version.setKey(KEY_VERSION);    // Set key to avoid from creating multi instance.
-            version.setTitle(R.string.vpn_version);
-            version.setSummary(mPackageInfo.versionName);
-            version.setSelectable(false);
-            getPreferenceScreen().addPreference(version);
         } else {
             finish();
         }
diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java
index 8ee2f5f2d0c..12b7b908813 100644
--- a/src/com/android/settings/vpn2/AppPreference.java
+++ b/src/com/android/settings/vpn2/AppPreference.java
@@ -29,6 +29,7 @@ import com.android.internal.net.LegacyVpnInfo;
 import com.android.internal.net.VpnConfig;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settings.R;
 
 /**
  * {@link androidx.preference.Preference} containing information about a VPN
@@ -42,7 +43,7 @@ public class AppPreference extends ManageablePreference {
     private final String mName;
 
     public AppPreference(Context context, int userId, String packageName) {
-        super(context, null /* attrs */);
+        super(context, null /* attrs */, R.style.VpnAppManagementPreferenceStyle, 0);
         super.setUserId(userId);
 
         mPackageName = packageName;
diff --git a/src/com/android/settings/vpn2/ManageablePreference.java b/src/com/android/settings/vpn2/ManageablePreference.java
index 1aea9474430..291b6d22d35 100644
--- a/src/com/android/settings/vpn2/ManageablePreference.java
+++ b/src/com/android/settings/vpn2/ManageablePreference.java
@@ -44,7 +44,12 @@ public abstract class ManageablePreference extends GearPreference {
     int mUserId;
 
     public ManageablePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
+        this(context, attrs, 0, 0);
+    }
+
+    public ManageablePreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
         setPersistent(false);
         setOrder(0);
         setUserId(UserHandle.myUserId());
diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java
index 82bc1f0c203..df526603ad9 100644
--- a/src/com/android/settings/widget/GearPreference.java
+++ b/src/com/android/settings/widget/GearPreference.java
@@ -33,6 +33,11 @@ public class GearPreference extends RestrictedPreference implements View.OnClick
     protected boolean mGearState = true;
     private OnGearClickListener mOnGearClickListener;
 
+    public GearPreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
     public GearPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
     }