diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 3c4b0a4a8..e142dc24f 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -101,8 +101,7 @@
     </activity>
     <activity android:name=".PreferencesActivity"
               android:label="@string/preferences_name"
-              android:stateNotNeeded="true">
-    </activity>
+              android:stateNotNeeded="true"/>
     <activity android:name=".encode.EncodeActivity"
               android:stateNotNeeded="true">
       <intent-filter>
@@ -142,36 +141,16 @@
     </activity>
     <activity android:name=".history.HistoryActivity"
               android:label="@string/history_title"
-              android:stateNotNeeded="true">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-    </activity>
+              android:stateNotNeeded="true"/>
     <activity android:name=".share.BookmarkPickerActivity"
               android:label="@string/bookmark_picker_name"
-              android:stateNotNeeded="true">
-      <intent-filter>
-        <action android:name="android.intent.action.PICK"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-    </activity>
+              android:stateNotNeeded="true"/>
     <activity android:name=".share.AppPickerActivity"
               android:label="@string/app_picker_name"
-              android:stateNotNeeded="true"
-              android:configChanges="orientation">
-      <intent-filter>
-        <action android:name="android.intent.action.PICK"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-    </activity>
+              android:stateNotNeeded="true"/>
     <activity android:name=".HelpActivity"
-              android:screenOrientation="user">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-    </activity>
+              android:label="@string/menu_help"
+              android:screenOrientation="user"/>
   </application>
 
 </manifest>
diff --git a/android/gen/R.java.d b/android/gen/R.java.d
index 1703fa2af..3a4ebdfe8 100644
--- a/android/gen/R.java.d
+++ b/android/gen/R.java.d
@@ -60,4 +60,9 @@
 /Users/srowen/Documents/ZXing/android/res/values-zh-rCN/strings.xml \
 /Users/srowen/Documents/ZXing/android/res/values-zh-rTW/strings.xml \
 /Users/srowen/Documents/ZXing/android/res/xml/preferences.xml \
+/Users/srowen/Documents/ZXing/android/bin/res/drawable/launcher_icon.png \
+/Users/srowen/Documents/ZXing/android/bin/res/drawable/share_via_barcode.png \
+/Users/srowen/Documents/ZXing/android/bin/res/drawable-hdpi/launcher_icon.png \
+/Users/srowen/Documents/ZXing/android/bin/res/drawable-xhdpi/launcher_icon.png \
+/Users/srowen/Documents/ZXing/android/bin/res/drawable-xxhdpi/launcher_icon.png \
 /Users/srowen/Documents/ZXing/android/bin/AndroidManifest.xml \
diff --git a/android/src/com/google/zxing/client/android/PreferencesActivity.java b/android/src/com/google/zxing/client/android/PreferencesActivity.java
index 5007716a7..6beeb99ab 100755
--- a/android/src/com/google/zxing/client/android/PreferencesActivity.java
+++ b/android/src/com/google/zxing/client/android/PreferencesActivity.java
@@ -54,7 +54,14 @@ public final class PreferencesActivity extends Activity {
   protected void onCreate(Bundle icicle) {
     super.onCreate(icicle);
     getFragmentManager().beginTransaction().replace(android.R.id.content, new PreferencesFragment()).commit();
-
   }
 
+  // Apparently this will be necessary when targeting API 19+:
+  /*
+  @Override
+  protected boolean isValidFragment(String fragmentName) {
+    return true;
+  }
+   */
+
 }