diff --git a/src/keepass2android/Resources/drawable-mdpi/collections_collection.png b/src/keepass2android/Resources/drawable-mdpi/collections_collection.png
deleted file mode 100644
index d1324014..00000000
Binary files a/src/keepass2android/Resources/drawable-mdpi/collections_collection.png and /dev/null differ
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_menu_add_field_holo_light.png b/src/keepass2android/Resources/drawable-mdpi/ic_menu_add_field_holo_light.png
deleted file mode 100644
index 4a4990c0..00000000
Binary files a/src/keepass2android/Resources/drawable-mdpi/ic_menu_add_field_holo_light.png and /dev/null differ
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_menu_remove_field_holo_light.png b/src/keepass2android/Resources/drawable-mdpi/ic_menu_remove_field_holo_light.png
deleted file mode 100644
index b31359f7..00000000
Binary files a/src/keepass2android/Resources/drawable-mdpi/ic_menu_remove_field_holo_light.png and /dev/null differ
diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_cross.png b/src/keepass2android/Resources/drawable-xhdpi/ic_cross.png
new file mode 100644
index 00000000..d2a6af7a
Binary files /dev/null and b/src/keepass2android/Resources/drawable-xhdpi/ic_cross.png differ
diff --git a/src/keepass2android/Resources/layout/file_selection.xml b/src/keepass2android/Resources/layout/file_selection.xml
index b5268ed8..a9b052dd 100644
--- a/src/keepass2android/Resources/layout/file_selection.xml
+++ b/src/keepass2android/Resources/layout/file_selection.xml
@@ -52,21 +52,4 @@
           android:layout_weight="1"
         />
   
-</LinearLayout>
-<!-- <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_margin="12dip">
-    <TextView
-        android:id="@+id/file_listtop"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/listSeparatorTextViewStyle"
-        android:text="@string/open_recent" />
-    <ListView
-        android:id="@android:id/list"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/file_listtop" />
-</RelativeLayout>-->
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/group.xml b/src/keepass2android/Resources/layout/group.xml
index a9e7adce..a1038658 100644
--- a/src/keepass2android/Resources/layout/group.xml
+++ b/src/keepass2android/Resources/layout/group.xml
@@ -61,7 +61,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|bottom|right"
                 android:visibility="gone"
-                android:src="@android:drawable/ic_menu_close_clear_cancel" />
+                android:src="@drawable/ic_cross" />
     
     <android.support.design.widget.FloatingActionButton
                 android:id="@+id/fabAddNew"
diff --git a/src/keepass2android/Resources/values/styles_material.xml b/src/keepass2android/Resources/values/styles_material.xml
index d2046b36..fb1b6644 100644
--- a/src/keepass2android/Resources/values/styles_material.xml
+++ b/src/keepass2android/Resources/values/styles_material.xml
@@ -108,8 +108,6 @@
 
    <item name="CancelDrawable">@android:drawable/ic_menu_close_clear_cancel</item>
 
-    <item name="OpenFileDrawable">@drawable/collections_collection</item>
-    <item name="ic_menu_add_field">@drawable/ic_menu_add_field_holo_light</item>
     <item name="ic_launcher_folder_small">@drawable/ic_launcher_folder_small</item>
     <item name="ic_action_search_drawable">@drawable/ic_action_search</item>
     <item name="NavigationAcceptDrawable">@drawable/navigation_accept</item>
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index cde73920..d7fccc52 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -358,7 +358,9 @@
       <SubType>Designer</SubType>
     </AndroidResource>
     <AndroidResource Include="Resources\layout\set_password.xml" />
-    <AndroidResource Include="Resources\menu\entry.xml" />
+    <AndroidResource Include="Resources\menu\entry.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\menu\entry_edit.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
@@ -437,10 +439,7 @@
     <AndroidResource Include="Resources\values-uk\strings.xml" />
     <AndroidResource Include="Resources\values-zh-rCN\strings.xml" />
     <AndroidResource Include="Resources\values-zh-rTW\strings.xml" />
-    <AndroidResource Include="Resources\drawable-mdpi\ic_menu_add_field_holo_light.png" />
-    <AndroidResource Include="Resources\drawable-mdpi\ic_menu_remove_field_holo_light.png" />
     <AndroidResource Include="Resources\layout\InViewButton.xml" />
-    <AndroidResource Include="Resources\drawable-mdpi\collections_collection.png" />
     <AndroidResource Include="Resources\layout\entry_view_test.xml" />
     <AndroidResource Include="Resources\layout\entry_extrastring_title.xml" />
     <AndroidResource Include="Resources\layout\entry_extrastring_value.xml" />
@@ -1050,4 +1049,7 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\ic_action_eye_open.png" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_cross.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file