diff --git a/res/values/strings.xml b/res/values/strings.xml
index 50f9424567e..ab5c1d0ed9f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12523,9 +12523,9 @@
     <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
     <string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
     <!-- Label text to view airplane-safe networks. [CHAR LIMIT=40] -->
-    <string name="view_airplane_safe_networks">View airplane-safe networks</string>
+    <string name="view_airplane_safe_networks">View airplane mode networks</string>
     <!-- Label text to turn off airplane mode. [CHAR LIMIT=40] -->
-    <string name="turn_off_airplane_mode">Turn off Airplane Mode</string>
+    <string name="turn_off_airplane_mode">Turn off airplane mode</string>
 
     <!-- Provider Model: Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->
     <string name="mobile_data_connection_active">Active, <xliff:g id="network_data_rat" example="LTE">%1$s</xliff:g></string>
diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java
index 5314d7f177b..a495e8963b7 100644
--- a/src/com/android/settings/network/ProviderModelSlice.java
+++ b/src/com/android/settings/network/ProviderModelSlice.java
@@ -82,7 +82,7 @@ public class ProviderModelSlice extends WifiSlice {
         // Third section:  Add the Wi-Fi items which are not connected.
         // Fourth section:  If device has connection problem, this row show the message for user.
 
-        if (mHelper.isAirplaneModeEnabled()) {
+        if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled()) {
             log("Airplane mode is enabled.");
             // ToDo Next CL will add the Airplane mode Message.
             return mHelper.createListBuilder(getUri()).build();
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index 56d87c34b29..898de56c836 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -183,7 +183,7 @@ public class WifiSlice implements CustomSliceable {
 
     private IconCompat getEndIcon(WifiSliceItem wifiSliceItem) {
         if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
-            return null;
+            return IconCompat.createWithResource(mContext, R.drawable.ic_settings_24dp);
         }
 
         if (wifiSliceItem.getSecurity() != WifiEntry.SECURITY_NONE) {
diff --git a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
index c479c2520c0..a344ab6a489 100644
--- a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
+++ b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
@@ -35,6 +35,7 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.android.settings.testutils.AirplaneModeRule;
+import com.android.settings.testutils.ResourcesUtils;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -47,9 +48,6 @@ import org.mockito.junit.MockitoRule;
 @RunWith(AndroidJUnit4.class)
 public class AirplaneSafeNetworksSliceTest {
 
-    private static final String VIEW_AIRPLANE_SAFE_NETWORKS = "View airplane-safe networks";
-    private static final String TURN_OFF_AIRPLANE_MODE = "Turn off Airplane Mode";
-
     @Rule
     public MockitoRule mMocks = MockitoJUnit.rule();
     @Rule
@@ -88,7 +86,8 @@ public class AirplaneSafeNetworksSliceTest {
         assertThat(slice).isNotNull();
         final SliceItem sliceTitle =
                 SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
-        assertThat(sliceTitle.getText()).isEqualTo(VIEW_AIRPLANE_SAFE_NETWORKS);
+        assertThat(sliceTitle.getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "view_airplane_safe_networks"));
     }
 
     @Test
@@ -101,7 +100,8 @@ public class AirplaneSafeNetworksSliceTest {
         assertThat(slice).isNotNull();
         final SliceItem sliceTitle =
                 SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
-        assertThat(sliceTitle.getText()).isEqualTo(TURN_OFF_AIRPLANE_MODE);
+        assertThat(sliceTitle.getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "turn_off_airplane_mode"));
     }
 
     @Test