diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 621479608..65d635367 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -192,6 +192,7 @@
             android:label="@string/activity_folder_selection" />
 
         <activity android:name="com.android.email2.ui.MailboxSelectionActivityEmail"
+            android:theme="@style/ShortcutWidgetTheme"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -204,6 +205,7 @@
         </activity>
 
         <activity android:name="com.android.mail.ui.MailboxSelectionActivity"
+            android:theme="@style/ShortcutWidgetTheme"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
diff --git a/res/mipmap-hdpi/ic_launcher_shortcut_folder.png b/res/mipmap-hdpi/ic_launcher_shortcut_folder.png
deleted file mode 100644
index 608547ae3..000000000
Binary files a/res/mipmap-hdpi/ic_launcher_shortcut_folder.png and /dev/null differ
diff --git a/res/mipmap-mdpi/ic_launcher_shortcut_folder.png b/res/mipmap-mdpi/ic_launcher_shortcut_folder.png
deleted file mode 100644
index c028d3a66..000000000
Binary files a/res/mipmap-mdpi/ic_launcher_shortcut_folder.png and /dev/null differ
diff --git a/res/mipmap-xhdpi/ic_launcher_shortcut_folder.png b/res/mipmap-xhdpi/ic_launcher_shortcut_folder.png
deleted file mode 100644
index 7e36d8e22..000000000
Binary files a/res/mipmap-xhdpi/ic_launcher_shortcut_folder.png and /dev/null differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_shortcut_folder.png b/res/mipmap-xxhdpi/ic_launcher_shortcut_folder.png
deleted file mode 100644
index ace512ba6..000000000
Binary files a/res/mipmap-xxhdpi/ic_launcher_shortcut_folder.png and /dev/null differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_shortcut_folder.png b/res/mipmap-xxxhdpi/ic_launcher_shortcut_folder.png
deleted file mode 100644
index 7abdb00c7..000000000
Binary files a/res/mipmap-xxxhdpi/ic_launcher_shortcut_folder.png and /dev/null differ