diff --git a/res/drawable/accessibility_shortcut_type_hardware.png b/res/drawable/accessibility_shortcut_type_hardware.png
index 141af831ded..664ceb368b7 100644
Binary files a/res/drawable/accessibility_shortcut_type_hardware.png and b/res/drawable/accessibility_shortcut_type_hardware.png differ
diff --git a/res/drawable/accessibility_shortcut_type_software.png b/res/drawable/accessibility_shortcut_type_software.png
index 5b0611dc58e..0212548c8e9 100644
Binary files a/res/drawable/accessibility_shortcut_type_software.png and b/res/drawable/accessibility_shortcut_type_software.png differ
diff --git a/res/drawable/accessibility_shortcut_type_software_gesture.png b/res/drawable/accessibility_shortcut_type_software_gesture.png
index a5df752f290..0a2921a29c4 100644
Binary files a/res/drawable/accessibility_shortcut_type_software_gesture.png and b/res/drawable/accessibility_shortcut_type_software_gesture.png differ
diff --git a/res/drawable/accessibility_shortcut_type_software_gesture_talkback.png b/res/drawable/accessibility_shortcut_type_software_gesture_talkback.png
index a8d86aa5f8e..85fec85cc94 100644
Binary files a/res/drawable/accessibility_shortcut_type_software_gesture_talkback.png and b/res/drawable/accessibility_shortcut_type_software_gesture_talkback.png differ
diff --git a/res/drawable/accessibility_shortcut_type_triple_tap.png b/res/drawable/accessibility_shortcut_type_triple_tap.png
index 5c6ce9564fd..6a08d29b2ee 100644
Binary files a/res/drawable/accessibility_shortcut_type_triple_tap.png and b/res/drawable/accessibility_shortcut_type_triple_tap.png differ
diff --git a/res/drawable/ic_accessibility_new.xml b/res/drawable/ic_accessibility_new.xml
index 6bfc6c60f92..13472397895 100644
--- a/res/drawable/ic_accessibility_new.xml
+++ b/res/drawable/ic_accessibility_new.xml
@@ -18,7 +18,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
   <path
       android:fillColor="#757575"
       android:pathData="M20.5,6c-2.61,0.7 -5.67,1 -8.5,1s-5.89,-0.3 -8.5,-1L3,8c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V9c2,-0.17 4.14,-0.5 6,-1l-0.5,-2zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
diff --git a/res/layout/accessibility_edit_shortcut.xml b/res/layout/accessibility_edit_shortcut.xml
index 753adb1b8a5..412ce94329b 100644
--- a/res/layout/accessibility_edit_shortcut.xml
+++ b/res/layout/accessibility_edit_shortcut.xml
@@ -22,19 +22,19 @@
     android:scrollbarStyle="outsideOverlay">
 
     <LinearLayout
-        android:theme="@style/Theme.AlertDialog"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingTop="24dp"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp">
+        android:padding="24dp">
 
         <include android:id="@+id/software_shortcut"
-                 layout="@layout/accessibility_edit_shortcut_component"/>
+            layout="@layout/accessibility_edit_shortcut_component"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp" />
 
         <include android:id="@+id/hardware_shortcut"
-                 layout="@layout/accessibility_edit_shortcut_component"/>
+            layout="@layout/accessibility_edit_shortcut_component" />
 
     </LinearLayout>
 
diff --git a/res/layout/accessibility_edit_shortcut_component.xml b/res/layout/accessibility_edit_shortcut_component.xml
index dd92a1d770b..02938c3a903 100644
--- a/res/layout/accessibility_edit_shortcut_component.xml
+++ b/res/layout/accessibility_edit_shortcut_component.xml
@@ -19,32 +19,32 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingBottom="16dp">
+    android:orientation="vertical">
 
     <CheckBox
         android:id="@+id/checkbox"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
+        android:paddingStart="12dp"
         android:saveEnabled="false"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        android:textColor="?android:attr/textColorAlertDialogListItem" />
+        android:textColor="?android:attr/textColorAlertDialogListItem"
+        android:textSize="16sp" />
 
     <TextView
         android:id="@+id/summary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="8dp"
-        android:paddingStart="32dp"
+        android:paddingStart="44dp"
         android:textAppearance="?android:attr/textAppearanceListItemSecondary"
         android:textColor="?android:attr/textColorSecondary" />
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="32dp"
-        android:scaleType="fitCenter" />
+        android:layout_width="176dp"
+        android:layout_height="176dp"
+        android:layout_marginStart="44dp"
+        android:scaleType="centerCrop" />
 
 </LinearLayout>
diff --git a/res/layout/accessibility_edit_shortcut_magnification.xml b/res/layout/accessibility_edit_shortcut_magnification.xml
index 8a724cca6d6..afb1ec88412 100644
--- a/res/layout/accessibility_edit_shortcut_magnification.xml
+++ b/res/layout/accessibility_edit_shortcut_magnification.xml
@@ -15,26 +15,30 @@
   limitations under the License
   -->
 
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbarStyle="outsideOverlay">
 
     <LinearLayout
-        android:theme="@style/Theme.AlertDialog"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingTop="24dp"
-        android:paddingStart="24dp"
-        android:paddingEnd="24dp">
+        android:padding="24dp">
 
-        <include android:id="@+id/software_shortcut"
-                 layout="@layout/accessibility_edit_shortcut_component"/>
+        <include
+            android:id="@+id/software_shortcut"
+            layout="@layout/accessibility_edit_shortcut_component"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp" />
 
-        <include android:id="@+id/hardware_shortcut"
-                 layout="@layout/accessibility_edit_shortcut_component"/>
+        <include
+            android:id="@+id/hardware_shortcut"
+            layout="@layout/accessibility_edit_shortcut_component"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="32dp" />
 
         <LinearLayout
             android:id="@+id/advanced_shortcut"
@@ -45,24 +49,27 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_keyboard_arrow_down"
-                android:scaleType="fitCenter"/>
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_keyboard_arrow_down" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center_vertical"
                 android:minHeight="?android:attr/listPreferredItemHeightSmall"
+                android:paddingStart="12dp"
                 android:text="@string/accessibility_shortcut_edit_dialog_title_advance"
                 android:textAppearance="?android:attr/textAppearanceListItem"
-                android:textColor="?android:attr/colorAccent" />
+                android:textColor="?android:attr/colorAccent"
+                android:textSize="16sp" />
 
-        </LinearLayout>>
+        </LinearLayout>
 
-        <include android:id="@+id/triple_tap_shortcut"
-                 layout="@layout/accessibility_edit_shortcut_component"
-                 android:visibility="gone"/>
+        <include
+            android:id="@+id/triple_tap_shortcut"
+            layout="@layout/accessibility_edit_shortcut_component"
+            android:visibility="gone" />
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
index c96013f5bb0..fbe1e7728bb 100644
--- a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
@@ -285,7 +285,6 @@ public class AccessibilityEditDialogUtils {
         final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
         final ImageSpan imageSpan = new ImageSpan(icon);
         imageSpan.setContentDescription("");
-        icon.setTint(getThemeAttrColor(context, android.R.attr.textColorPrimary));
         icon.setBounds(0, 0, lineHeight, lineHeight);
         spannableMessage.setSpan(
                 imageSpan, indexIconStart, indexIconEnd,
diff --git a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
index 0c8644f649b..ddf7bd442f8 100644
--- a/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
+++ b/src/com/android/settings/accessibility/AccessibilityGestureNavigationTutorial.java
@@ -178,7 +178,6 @@ public class AccessibilityGestureNavigationTutorial {
         final Drawable icon = context.getDrawable(R.drawable.ic_accessibility_new);
         final ImageSpan imageSpan = new ImageSpan(icon);
         imageSpan.setContentDescription("");
-        icon.setTint(getThemeAttrColor(context, android.R.attr.textColorPrimary));
         icon.setBounds(0, 0, lineHeight, lineHeight);
         spannableMessage.setSpan(
                 imageSpan, indexIconStart, indexIconEnd,
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index ec5784ebf78..c0ad2ac235a 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -43,7 +43,6 @@ import java.util.List;
 public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePreferenceFragment {
 
     private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
-    private static final int DIALOG_ID_EDIT_SHORTCUT = 1;
     private final Handler mHandler = new Handler();
     private SettingsContentObserver mSettingsContentObserver;
 
@@ -117,7 +116,7 @@ public class ToggleColorInversionPreferenceFragment extends ToggleFeaturePrefere
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
         super.onSettingsClicked(preference);
-        showDialog(DIALOG_ID_EDIT_SHORTCUT);
+        showDialog(DialogEnums.EDIT_SHORTCUT);
     }
 
     private void updateSwitchBarToggleSwitch() {