diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 473dfeb21..76922cdca 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -72,7 +72,8 @@
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".android.thrustcurve.TCQueryActivity"
-            android:theme="@style/Theme.Sherlock.Dialog" />
+            android:launchMode="singleTask"
+            android:theme="@style/AppTheme.Dialog" />
         <activity
             android:name=".android.simulation.SimulationViewActivity"
             android:theme="@style/AppTheme.NoActionBar" />
diff --git a/android/res/drawable-hdpi/ic_menu_download.png b/android/res/drawable-hdpi/ic_menu_download.png
new file mode 100644
index 000000000..628028c7a
Binary files /dev/null and b/android/res/drawable-hdpi/ic_menu_download.png differ
diff --git a/android/res/drawable-hdpi/ic_menu_search.png b/android/res/drawable-hdpi/ic_menu_search.png
deleted file mode 100644
index a7f9bbeee..000000000
Binary files a/android/res/drawable-hdpi/ic_menu_search.png and /dev/null differ
diff --git a/android/res/drawable-ldpi/ic_menu_search.png b/android/res/drawable-ldpi/ic_menu_search.png
deleted file mode 100644
index 1d95408c6..000000000
Binary files a/android/res/drawable-ldpi/ic_menu_search.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_menu_search.png b/android/res/drawable-mdpi/ic_menu_search.png
deleted file mode 100644
index 5d3155e02..000000000
Binary files a/android/res/drawable-mdpi/ic_menu_search.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/ic_menu_download.png b/android/res/drawable-xhdpi/ic_menu_download.png
new file mode 100644
index 000000000..fdbb334ef
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_menu_download.png differ
diff --git a/android/res/drawable-xhdpi/ic_menu_search.png b/android/res/drawable-xhdpi/ic_menu_search.png
deleted file mode 100644
index 5c18f9e8e..000000000
Binary files a/android/res/drawable-xhdpi/ic_menu_search.png and /dev/null differ
diff --git a/android/res/menu/motor_browser_option_menu.xml b/android/res/menu/motor_browser_option_menu.xml
index caded38b6..36308523e 100644
--- a/android/res/menu/motor_browser_option_menu.xml
+++ b/android/res/menu/motor_browser_option_menu.xml
@@ -4,7 +4,7 @@
     <item
         android:id="@+id/download_from_thrustcurve_menu_option"
         android:title="@string/Download"
-        android:icon="@drawable/ic_menu_search"
+        android:icon="@drawable/ic_menu_download"
         android:showAsAction="always"/>
     <item
         android:id="@+id/preference_menu_option"
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index e023464c7..c0d4d49fd 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -38,7 +38,7 @@
     </string-array>
 
     <string name="TCMotorSearchFormSubmit">Submit</string>
-    <string name="TCMotorSearchFormTitle">Search Thrustcurve.org</string>
+    <string name="TCMotorSearchFormTitle">Download from Thrustcurve.org</string>
     <string name="overviewConfigurationSpinnerPrompt">Select Configuration</string>
     <string name="simulationSeries1Label">Series 1</string>
     <string name="simulationSeries2Label">Series 2</string>
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 303484eac..edb9e721f 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -14,7 +14,7 @@
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="android:windowNoTitle">true</item>
         <item name="windowNoTitle">true</item>
-        </style>
+    </style>
 
     <style name="spinnerStyle" parent="Widget.Sherlock.TextView.SpinnerItem">
         <item name="android:textSize">26dp</item>
@@ -22,4 +22,12 @@
         <item name="android:layout_height">30dp</item>
     </style>
 
+    <style name="DialogWindowTitleTwoLines" parent="DialogWindowTitle.Sherlock">
+        <item name="android:maxLines">2</item>
+    </style>
+
+    <style name="AppTheme.Dialog" parent="Theme.Sherlock.Dialog">
+        <item name="android:windowTitleStyle">@style/DialogWindowTitleTwoLines</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
index 60bb7be1b..91269d6e2 100644
--- a/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorBrowserActivity.java
@@ -3,8 +3,10 @@ package net.sf.openrocket.android.motor;
 import net.sf.openrocket.R;
 import net.sf.openrocket.android.ActivityHelpers;
 import net.sf.openrocket.android.PreferencesActivity;
+import net.sf.openrocket.android.db.DbAdapter;
 import net.sf.openrocket.android.util.AndroidLogWrapper;
 import android.content.Intent;
+import android.database.Cursor;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
@@ -39,6 +41,29 @@ implements MotorListFragment.OnMotorSelectedListener
 			.add( R.id.motorBrowserList, new MotorListFragment(), MOTOR_LIST_FRAGMENT)
 			.commit();
 		}
+
+	}
+
+	@Override
+	protected void onStart() {
+		super.onStart();
+		int motorCount = 0;
+
+		DbAdapter mDbHelper = new DbAdapter(this);
+		mDbHelper.open();
+		try {
+			Cursor motorCounter = mDbHelper.getMotorDao().fetchAllMotors();
+			motorCount = motorCounter.getCount();
+			motorCounter.close();
+		} finally {
+			mDbHelper.close();
+		}
+
+		if ( motorCount == 0 ) {
+			ActivityHelpers.downloadFromThrustcurve(this,DOWNLOAD_REQUEST_CODE);
+		}
+
+
 	}
 
 	@Override
diff --git a/android/src/net/sf/openrocket/android/motor/MotorListFragment.java b/android/src/net/sf/openrocket/android/motor/MotorListFragment.java
index efe5f40f1..216e0861b 100644
--- a/android/src/net/sf/openrocket/android/motor/MotorListFragment.java
+++ b/android/src/net/sf/openrocket/android/motor/MotorListFragment.java
@@ -237,18 +237,6 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
 		}
 		mDbHelper.open();
 
-		Cursor motorCounter = mDbHelper.getMotorDao().fetchAllMotors();
-		int motorCount = motorCounter.getCount();
-		motorCounter.close();
-		
-		if ( motorCount == 0 ) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-			builder.setTitle("No Motors Found");
-			builder.setMessage("Motors can be downloaded from thrustcurve");
-			builder.setCancelable(true);
-			builder.create().show();
-		}
-
 		Cursor motorCursor = mDbHelper.getMotorDao().fetchGroups(groupColumn);
 		MotorHierarchicalListAdapter mAdapter = new MotorHierarchicalListAdapter( 
 				getActivity(),