diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 54f2e86..48a4865 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -771,7 +771,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.notification.ZenModeSettings" />
             <meta-data android:name="com.android.settings.dismiss"
-                android:value="6,10,30" />
+                android:value="8,12,30" />
             <meta-data android:name="com.android.settings.title"
                 android:resource="@string/zen_mode_automation_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
@@ -792,12 +792,14 @@
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.SETTINGS_ONLY" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.title"
                        android:resource="@string/wallpaper_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/wallpaper_suggestion_summary" />
+            <meta-data android:name="com.android.settings.dismiss"
+                       android:value="3,7,30" />
         </activity>
 
         <activity android:name="Settings$ZenModeScheduleRuleSettingsActivity"
@@ -1567,7 +1569,7 @@
                 <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.dismiss"
-                android:value="4,8,30" />
+                android:value="5,9,30" />
             <meta-data android:name="com.android.settings.require_feature"
                 android:value="android.hardware.fingerprint" />
             <meta-data android:name="com.android.settings.title"
@@ -1651,10 +1653,10 @@
             android:icon="@drawable/ic_suggestion_fingerprint">
             <intent-filter android:priority="2">
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.android.settings.suggested.category.LOCK_SCREEN" />
+                <category android:name="com.android.settings.suggested.category.FIRST_IMPRESSION" />
             </intent-filter>
             <meta-data android:name="com.android.settings.dismiss"
-                       android:value="0,30" />
+                       android:value="2,6,30" />
             <meta-data android:name="com.android.settings.require_feature"
                 android:value="android.hardware.fingerprint" />
             <meta-data android:name="com.android.settings.title"
@@ -2787,7 +2789,7 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.WifiCallingSettings" />
             <meta-data android:name="com.android.settings.dismiss"
-                android:value="7,11,30" />
+                android:value="10,14,30" />
             <meta-data android:name="com.android.settings.title"
                 android:resource="@string/wifi_calling_suggestion_title" />
             <meta-data android:name="com.android.settings.summary"
diff --git a/res/drawable/ic_suggestion_fingerprint.xml b/res/drawable/ic_suggestion_fingerprint.xml
index feebd94..bf5ee2e 100644
--- a/res/drawable/ic_suggestion_fingerprint.xml
+++ b/res/drawable/ic_suggestion_fingerprint.xml
@@ -18,7 +18,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="32dp"
         android:height="32dp"
-        android:tint="?android:attr/colorAccent"
+        android:tint="?android:attr/colorControlNormal"
         android:viewportWidth="32.0"
         android:viewportHeight="32.0">
     <path
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 28252c5..abb4673 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3549,7 +3549,7 @@
     <!-- Category title listing recently used apps [CHAR_LIMIT=50]-->
     <string name="recent_app_category_title">Recently opened apps</string>
     <!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->
-    <string name="see_all_apps_title">See all <xliff:g>%1$d</xliff:g> apps</string>
+    <string name="see_all_apps_title">See all <xliff:g id="count" example="3">%1$d</xliff:g> apps</string>
     <!-- Preference summary for each recently used app, which is the time since last used, i.e. "7 h 20 min ago". Note: ^1 should be used in all translations [CHAR_LIMIT=60] -->
     <string name="recent_app_summary"><xliff:g id="time">^1</xliff:g> ago</string>
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index c387278..af39534 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -17,13 +17,6 @@
 
 package com.android.settings.fuelgauge;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
 import android.content.Context;
 import android.content.Intent;
 import android.os.BatteryManager;
@@ -45,6 +38,11 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH,
         sdk = TestConfig.SDK_VERSION,
diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
index 86f3bd6..c0e9106 100644
--- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
+++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
@@ -60,7 +60,7 @@
     @Test
     public void wallpaperSuggestion_isValid() {
         assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
-                CATEGORY_SETTINGS_ONLY,
+                CATEGORY_FIRST_IMPRESSION,
                 R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
     }