diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index 9dbcfed6cc3..993bf916418 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -16,15 +16,13 @@
   -->
 
 <PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:key="manage_assist">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/assist_and_voice_input_title">
 
     <com.android.settings.applications.DefaultAssistPreference
-            android:key="default_assist"
-            android:title="@string/default_assist_title"
-            android:summary="@string/default_assist_none"
-            />
+        android:key="default_assist"
+        android:title="@string/default_assist_title"
+        android:summary="@string/default_assist_none"/>
 
     <SwitchPreference
         android:key="context"
@@ -38,19 +36,12 @@
         android:summary="@string/assist_access_screenshot_summary"/>
 
     <SwitchPreference
-            android:key="flash"
-            android:title="@string/assist_flash_title"
-            android:summary="@string/assist_flash_summary"
-    />
+        android:key="flash"
+        android:title="@string/assist_flash_title"
+        android:summary="@string/assist_flash_summary"/>
 
     <com.android.settings.voice.VoiceInputListPreference
-            android:key="voice_input_settings"
-            android:title="@string/voice_input_settings_title"
-            />
-
-    <com.android.settings.DividerPreference
-        android:summary="@string/assist_footer"
-        android:selectable="false"
-        settings:allowDividerAbove="true" />
+        android:key="voice_input_settings"
+        android:title="@string/voice_input_settings_title"/>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/applications/ManageAssist.java b/src/com/android/settings/applications/ManageAssist.java
index 37ae56fe62d..7fe56372ea9 100644
--- a/src/com/android/settings/applications/ManageAssist.java
+++ b/src/com/android/settings/applications/ManageAssist.java
@@ -68,7 +68,8 @@ public class ManageAssist extends SettingsPreferenceFragment
 
         mFlashPref = (SwitchPreference) findPreference(KEY_FLASH);
         mFlashPref.setOnPreferenceChangeListener(this);
-
+        mFooterPreferenceMixin.createFooterPreference()
+                .setTitle(R.string.assist_footer);
         mVoiceInputPref = (VoiceInputListPreference) findPreference(KEY_VOICE_INPUT);
         updateUi();
     }
diff --git a/src/com/android/settings/dashboard/DashboardTilePreference.java b/src/com/android/settings/dashboard/DashboardTilePreference.java
deleted file mode 100644
index 918cf0841f4..00000000000
--- a/src/com/android/settings/dashboard/DashboardTilePreference.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import com.android.settings.DividerPreference;
-import com.android.settings.R;
-
-/**
- * A {@code Preference} styled as a dashboard tile.
- */
-public class DashboardTilePreference extends DividerPreference {
-
-    public DashboardTilePreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public DashboardTilePreference(Context context) {
-        super(context);
-        init();
-    }
-
-    private void init() {
-        setLayoutResource(R.layout.dashboard_tile);
-        setDividerAllowedAbove(false);
-        setDividerAllowedBelow(false);
-    }
-
-}