diff --git a/res/drawable-nodpi/email_widget_preview.png b/res/drawable-nodpi/mail_widget_preview.png
similarity index 100%
rename from res/drawable-nodpi/email_widget_preview.png
rename to res/drawable-nodpi/mail_widget_preview.png
diff --git a/res/layout/password_selector.xml b/res/layout/password_selector.xml
deleted file mode 100644
index e92bc20d1..000000000
--- a/res/layout/password_selector.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:orientation="vertical" >
-
-    <TextView
-        android:text="@string/account_setup_incoming_password_label"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="?android:attr/textColorPrimary" />
-    <EditText
-        android:id="@+id/account_password"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:hint="@string/password_hint"
-        android:inputType="textPassword"
-        android:imeOptions="actionNext" />
-
-</LinearLayout>
diff --git a/res/xml-sw600dp/widget_info.xml b/res/xml-sw600dp/widget_info.xml
index 34ad6cfaa..6646216b8 100644
--- a/res/xml-sw600dp/widget_info.xml
+++ b/res/xml-sw600dp/widget_info.xml
@@ -18,7 +18,7 @@
     android:minWidth="220dp"
     android:minHeight="220dp"
     android:updatePeriodMillis="0"
-    android:previewImage="@drawable/email_widget_preview"
+    android:previewImage="@drawable/mail_widget_preview"
     android:initialLayout="@layout/widget"
     android:resizeMode="horizontal|vertical"
     android:configure="com.android.email2.ui.MailboxSelectionActivityEmail"
diff --git a/res/xml/widget_info.xml b/res/xml/widget_info.xml
index 25b1e52f4..d79908ff2 100644
--- a/res/xml/widget_info.xml
+++ b/res/xml/widget_info.xml
@@ -20,7 +20,7 @@
     android:minResizeWidth="180dp"
     android:minResizeHeight="110dp"
     android:updatePeriodMillis="0"
-    android:previewImage="@drawable/email_widget_preview"
+    android:previewImage="@drawable/mail_widget_preview"
     android:initialLayout="@layout/widget"
     android:resizeMode="horizontal|vertical"
     android:configure="com.android.email2.ui.MailboxSelectionActivityEmail"