diff --git a/src/com/android/settings/wifi/AddWifiNetworkPreference.java b/src/com/android/settings/wifi/AddWifiNetworkPreference.java
index ea229541886..6c22e53bcdf 100644
--- a/src/com/android/settings/wifi/AddWifiNetworkPreference.java
+++ b/src/com/android/settings/wifi/AddWifiNetworkPreference.java
@@ -23,6 +23,7 @@ import android.os.UserManager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
@@ -32,6 +33,7 @@ import androidx.preference.PreferenceViewHolder;
 import com.android.settings.R;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.widget.SettingsThemeHelper;
 import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
 
 /**
@@ -62,6 +64,20 @@ public class AddWifiNetworkPreference extends RestrictedPreference {
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
+        // Set padding to expressive style
+        if (SettingsThemeHelper.isExpressiveTheme(getContext())) {
+            final int paddingStart = getContext().getResources().getDimensionPixelSize(
+                    com.android.settingslib.widget.theme
+                            .R.dimen.settingslib_expressive_space_extrasmall4);
+            final int paddingEnd = getContext().getResources().getDimensionPixelSize(
+                    com.android.settingslib.widget.theme
+                            .R.dimen.settingslib_expressive_space_small3);
+            LinearLayout iconFrame = (LinearLayout) holder.findViewById(
+                    com.android.settingslib.R.id.icon_frame);
+            iconFrame.setPaddingRelative(paddingStart, iconFrame.getPaddingTop(),
+                    paddingEnd, iconFrame.getPaddingBottom());
+        }
+
         final ImageButton scanButton = (ImageButton) holder.findViewById(R.id.button_icon);
         scanButton.setImageDrawable(mScanIconDrawable);
         scanButton.setContentDescription(
diff --git a/src/com/android/settings/wifi/WifiEntryPreference.java b/src/com/android/settings/wifi/WifiEntryPreference.java
index e5290f41fea..4eb9d51f01f 100644
--- a/src/com/android/settings/wifi/WifiEntryPreference.java
+++ b/src/com/android/settings/wifi/WifiEntryPreference.java
@@ -26,6 +26,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.DrawableRes;
@@ -37,6 +38,7 @@ import androidx.preference.PreferenceViewHolder;
 import com.android.settingslib.R;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.Utils;
+import com.android.settingslib.widget.SettingsThemeHelper;
 import com.android.settingslib.wifi.WifiUtils;
 import com.android.wifitrackerlib.HotspotNetworkEntry;
 import com.android.wifitrackerlib.WifiEntry;
@@ -124,6 +126,20 @@ public class WifiEntryPreference extends RestrictedPreference implements
         view.findViewById(com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider)
                 .setVisibility(View.INVISIBLE);
 
+        // Set padding to expressive style
+        if (SettingsThemeHelper.isExpressiveTheme(getContext())) {
+            final int paddingStart = getContext().getResources().getDimensionPixelSize(
+                    com.android.settingslib.widget.theme
+                            .R.dimen.settingslib_expressive_space_extrasmall4);
+            final int paddingEnd = getContext().getResources().getDimensionPixelSize(
+                    com.android.settingslib.widget.theme
+                            .R.dimen.settingslib_expressive_space_small3);
+            LinearLayout iconFrame = (LinearLayout) view.findViewById(
+                    com.android.settingslib.R.id.icon_frame);
+            iconFrame.setPaddingRelative(paddingStart, iconFrame.getPaddingTop(),
+                    paddingEnd, iconFrame.getPaddingBottom());
+        }
+
         // Enable the icon button when the help string in this WifiEntry is not null.
         final ImageButton imageButton = (ImageButton) view.findViewById(R.id.icon_button);
         final ImageView frictionImageView = (ImageView) view.findViewById(