diff --git a/src/com/android/settings/wifi/WifiEntryPreference.java b/src/com/android/settings/wifi/WifiEntryPreference.java
index 3dfeadaacbd..a9b307c8e51 100644
--- a/src/com/android/settings/wifi/WifiEntryPreference.java
+++ b/src/com/android/settings/wifi/WifiEntryPreference.java
@@ -62,7 +62,7 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
 
     // StateListDrawable to display secured lock / metered "$" icon
     @Nullable private final StateListDrawable mFrictionSld;
-    private final IconInjector mIconInjector;
+    private final WifiUtils.InternetIconInjector mIconInjector;
     private WifiEntry mWifiEntry;
     private int mLevel = -1;
     private boolean mShowX; // Shows the Wi-Fi signl icon of Pie+x when it's true.
@@ -70,12 +70,12 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
     private OnButtonClickListener mOnButtonClickListener;
 
     public WifiEntryPreference(@NonNull Context context, @NonNull WifiEntry wifiEntry) {
-        this(context, wifiEntry, new IconInjector(context));
+        this(context, wifiEntry, new WifiUtils.InternetIconInjector(context));
     }
 
     @VisibleForTesting
     WifiEntryPreference(@NonNull Context context, @NonNull WifiEntry wifiEntry,
-            @NonNull IconInjector iconInjector) {
+            @NonNull WifiUtils.InternetIconInjector iconInjector) {
         super(context);
 
         setLayoutResource(R.layout.preference_access_point);
@@ -260,19 +260,6 @@ public class WifiEntryPreference extends Preference implements WifiEntry.WifiEnt
                         : context.getString(R.string.accessibility_wifi_security_type_secured));
     }
 
-
-    static class IconInjector {
-        private final Context mContext;
-
-        IconInjector(Context context) {
-            mContext = context;
-        }
-
-        public Drawable getIcon(boolean showX, int level) {
-            return mContext.getDrawable(WifiUtils.getInternetIconResource(level, showX));
-        }
-    }
-
     /**
      * Set listeners, who want to listen the button client event.
      */
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java
index 175c18362de..b782a702a0e 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEntryPreferenceTest.java
@@ -28,6 +28,7 @@ import android.widget.LinearLayout;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settingslib.R;
+import com.android.settingslib.wifi.WifiUtils;
 import com.android.wifitrackerlib.WifiEntry;
 
 import org.junit.Before;
@@ -49,7 +50,7 @@ public class WifiEntryPreferenceTest {
     @Mock
     private WifiEntry mMockWifiEntry;
     @Mock
-    private WifiEntryPreference.IconInjector mMockIconInjector;
+    private WifiUtils.InternetIconInjector mMockIconInjector;
 
     @Mock
     private Drawable mMockDrawable0;