diff --git a/xwords4/android/XWords4-dbg/img_src/.gitignore b/xwords4/android/XWords4-dbg/img_src/.gitignore
index 96355d851..196318da4 100644
--- a/xwords4/android/XWords4-dbg/img_src/.gitignore
+++ b/xwords4/android/XWords4-dbg/img_src/.gitignore
@@ -1,10 +1,13 @@
+/clear_all.svg
+/search.svg
+/select_all.svg
 back.svg
 content_copy.svg
 content_discard.svg
 content_new.svg
 dict.svg
-download.svg
 down.svg
+download.svg
 email.svg
 new_group.svg
 prefs.svg
diff --git a/xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore b/xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore
index bf9e3f65b..34ce345b7 100644
--- a/xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore
+++ b/xwords4/android/XWords4-dbg/res/drawable-hdpi/.gitignore
@@ -1,3 +1,6 @@
+/clear_all__gen.png
+/search__gen.png
+/select_all__gen.png
 back__gen.png
 content_copy__gen.png
 content_discard__gen.png
diff --git a/xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore b/xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore
index bf9e3f65b..34ce345b7 100644
--- a/xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore
+++ b/xwords4/android/XWords4-dbg/res/drawable-mdpi/.gitignore
@@ -1,3 +1,6 @@
+/clear_all__gen.png
+/search__gen.png
+/select_all__gen.png
 back__gen.png
 content_copy__gen.png
 content_discard__gen.png
diff --git a/xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore b/xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore
index bf9e3f65b..34ce345b7 100644
--- a/xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore
+++ b/xwords4/android/XWords4-dbg/res/drawable-xhdpi/.gitignore
@@ -1,3 +1,6 @@
+/clear_all__gen.png
+/search__gen.png
+/select_all__gen.png
 back__gen.png
 content_copy__gen.png
 content_discard__gen.png
diff --git a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
index efca10358..c64416e5a 100644
--- a/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
+++ b/xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
@@ -1,28 +1,53 @@
+#CrashTrack.java#
+/DlgID.java
+/LookupAlert.java
+ABUtils.java
+BTInviteActivity.java
+BTReceiver.java
+BTService.java
 BoardActivity.java
+BoardCanvas.java
 BoardDims.java
 BoardView.java
+BuildConstants.java
 ChatActivity.java
 CommsTransport.java
-DbgUtils.java
+ConnStatusHandler.java
 DBHelper.java
 DBUtils.java
+DbgUtils.java
 DictBrowseActivity.java
 DictImportActivity.java
 DictLangCache.java
 DictListPreference.java
-DictsActivity.java
 DictUtils.java
+DictsActivity.java
 DispatchNotify.java
 DlgDelegate.java
+DlgState.java
 EditColorPreference.java
+ExpiringDelegate.java
+ExpiringLinearLayout.java
+ExpiringTextView.java
 FirstRunDialog.java
+GCMConsts.java
+GCMIntentService.java
 GameConfig.java
 GameListAdapter.java
-GamesList.java
+GameListGroup.java
+GameListItem.java
+GameLock.java
+GameNamer.java
 GameUtils.java
+GamesList.java
 GitVersion.java
+InviteActivity.java
+LookupActivity.java
 MountEventReceiver.java
+MultiMsgSink.java
+MultiService.java
 NBSReceiver.java
+NFCUtils.java
 NetLaunchInfo.java
 NetStateCache.java
 NetUtils.java
@@ -35,51 +60,28 @@ RelayGameActivity.java
 RelayMsgSink.java
 RelayReceiver.java
 RelayService.java
-StatusReceiver.java
-Toolbar.java
-Utils.java
-XWActivity.java
-XWApp.java
-XWConstants.java
-XWEditTextPreference.java
-XWListActivity.java
-XWListAdapter.java
-XWListItem.java
-XWListPreference.java
-BTInviteActivity.java
-BTReceiver.java
-BTService.java
-MultiMsgSink.java
-GameNamer.java
-LookupActivity.java
-ABUtils.java
-BoardCanvas.java
-BuildConstants.java
-ConnStatusHandler.java
-DlgState.java
-ExpiringDelegate.java
-ExpiringLinearLayout.java
-ExpiringTextView.java
-GameListGroup.java
-GameListItem.java
-GameLock.java
-GCMConsts.java
-GCMIntentService.java
-InviteActivity.java
-MultiService.java
-NFCUtils.java
-SelectableItem.java
 SMSCheckBoxPreference.java
 SMSInviteActivity.java
 SMSListItem.java
 SMSReceiver.java
 SMSService.java
+SelectableItem.java
+StatusReceiver.java
 StudyList.java
 ThumbCanvas.java
+Toolbar.java
 UpdateCheckReceiver.java
+Utils.java
+XWActivity.java
+XWApp.java
+XWConstants.java
+XWEditTextPreference.java
 XWExpandableListActivity.java
+XWListActivity.java
+XWListAdapter.java
+XWListItem.java
+XWListPreference.java
 XWPrefs.java
 XWService.java
 XWSumListPreference.java
 XWThumbListPreference.java
-#CrashTrack.java#