diff --git a/res/layout/condition_tile_new_ui.xml b/res/layout/condition_tile.xml
similarity index 100%
rename from res/layout/condition_tile_new_ui.xml
rename to res/layout/condition_tile.xml
diff --git a/res/layout/suggestion_condition_container.xml b/res/layout/suggestion_condition_container.xml
index d9b4d6b5209..a4c60ad26a8 100644
--- a/res/layout/suggestion_condition_container.xml
+++ b/res/layout/suggestion_condition_container.xml
@@ -35,6 +35,7 @@
             android:id="@+id/data"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/material_grey_300"
             android:scrollbars="none"/>
 
     </android.support.v7.widget.CardView>
diff --git a/res/layout/suggestion_tile_new_ui.xml b/res/layout/suggestion_tile.xml
similarity index 100%
rename from res/layout/suggestion_tile_new_ui.xml
rename to res/layout/suggestion_tile.xml
diff --git a/res/layout/suggestion_tile_card.xml b/res/layout/suggestion_tile_remote_container.xml
similarity index 100%
rename from res/layout/suggestion_tile_card.xml
rename to res/layout/suggestion_tile_remote_container.xml
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
index 5a12f9d2eb5..eb768e50d0e 100644
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
+++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
@@ -70,7 +70,7 @@ public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
 
         @Override
         public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-            return viewHolder.getItemViewType() == R.layout.condition_tile_new_ui
+            return viewHolder.getItemViewType() == R.layout.condition_tile
                     ? super.getSwipeDirs(recyclerView, viewHolder) : 0;
         }
 
@@ -121,7 +121,7 @@ public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
 
     @Override
     public int getItemViewType(int position) {
-        return R.layout.condition_tile_new_ui;
+        return R.layout.condition_tile;
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
index 3a6582f91bf..7a2ab2da2d9 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
@@ -115,8 +115,8 @@ public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder>
     public int getItemViewType(int position) {
         Tile suggestion = getSuggestion(position);
         return suggestion.remoteViews != null
-                ? R.layout.suggestion_tile_card
-                : R.layout.suggestion_tile_new_ui;
+                ? R.layout.suggestion_tile_remote_container
+                : R.layout.suggestion_tile;
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
index 618b6df4a56..100c955716b 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionDismissController.java
@@ -66,8 +66,8 @@ public class SuggestionDismissController extends ItemTouchHelper.SimpleCallback
     @Override
     public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
         final int layoutId = viewHolder.getItemViewType();
-        if (layoutId == R.layout.suggestion_tile_new_ui
-                || layoutId == R.layout.suggestion_tile_card) {
+        if (layoutId == R.layout.suggestion_tile
+                || layoutId == R.layout.suggestion_tile_remote_container) {
             // Only return swipe direction for suggestion tiles. All other types are not swipeable.
             return super.getSwipeDirs(recyclerView, viewHolder);
         }
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
index c65113209e6..d943fe3ec74 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
@@ -99,13 +99,13 @@ public class ConditionAdapterTest {
     public void getItemViewType_shouldReturnConditionTile() {
         mConditionAdapter = new ConditionAdapter(
             mContext, mTwoConditions, DashboardData.HEADER_MODE_FULLY_EXPANDED);
-        assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile_new_ui);
+        assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile);
     }
 
     @Test
     public void onBindViewHolder_shouldSetListener() {
         final View view = LayoutInflater.from(mContext).inflate(
-            R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+            R.layout.condition_tile, new LinearLayout(mContext), true);
         final DashboardAdapter.DashboardItemHolder viewHolder =
             new DashboardAdapter.DashboardItemHolder(view);
         mConditionAdapter = new ConditionAdapter(
@@ -119,7 +119,7 @@ public class ConditionAdapterTest {
     @Test
     public void viewClick_shouldInvokeConditionPrimaryClick() {
         final View view = LayoutInflater.from(mContext).inflate(
-            R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+            R.layout.condition_tile, new LinearLayout(mContext), true);
         final DashboardAdapter.DashboardItemHolder viewHolder =
             new DashboardAdapter.DashboardItemHolder(view);
         mConditionAdapter = new ConditionAdapter(
@@ -135,7 +135,7 @@ public class ConditionAdapterTest {
     public void onSwiped_nullCondition_shouldNotCrash() {
         final RecyclerView recyclerView = new RecyclerView(mContext);
         final View view = LayoutInflater.from(mContext).inflate(
-                R.layout.condition_tile_new_ui, new LinearLayout(mContext), true);
+                R.layout.condition_tile, new LinearLayout(mContext), true);
         final DashboardAdapter.DashboardItemHolder viewHolder =
                 new DashboardAdapter.DashboardItemHolder(view);
         mConditionAdapter = new ConditionAdapter(
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
index c9e38158ed7..bd3650b74a7 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
@@ -105,13 +105,13 @@ public class SuggestionAdapterTest {
     public void getItemViewType_shouldReturnSuggestionTile() {
         mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
         assertThat(mSuggestionAdapter.getItemViewType(0))
-            .isEqualTo(R.layout.suggestion_tile_new_ui);
+            .isEqualTo(R.layout.suggestion_tile);
     }
 
     @Test
     public void onBindViewHolder_shouldSetListener() {
         final View view = spy(LayoutInflater.from(mContext).inflate(
-            R.layout.suggestion_tile_new_ui, new LinearLayout(mContext), true));
+            R.layout.suggestion_tile, new LinearLayout(mContext), true));
         mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
         mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
 
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
index 025e600819f..ca9faf56d51 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionDismissControllerTest.java
@@ -80,7 +80,7 @@ public class SuggestionDismissControllerTest {
     @Test
     public void getSwipeDirs_isSuggestionTile_shouldReturnDirection() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_new_ui);
+        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
@@ -89,7 +89,7 @@ public class SuggestionDismissControllerTest {
     @Test
     public void getSwipeDirs_isSuggestionTileCard_shouldReturnDirection() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_card);
+        when(vh.getItemViewType()).thenReturn(R.layout.suggestion_tile_remote_container);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(ItemTouchHelper.START | ItemTouchHelper.END);
@@ -98,7 +98,7 @@ public class SuggestionDismissControllerTest {
     @Test
     public void getSwipeDirs_isNotSuggestionTile_shouldReturn0() {
         final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
-        when(vh.getItemViewType()).thenReturn(R.layout.condition_tile_new_ui);
+        when(vh.getItemViewType()).thenReturn(R.layout.condition_tile);
 
         assertThat(mController.getSwipeDirs(mRecyclerView, vh))
                 .isEqualTo(0);