diff --git a/android/res/drawable-hdpi/actionbar_shadow.9.png b/android/res/drawable-hdpi/actionbar_shadow.9.png
deleted file mode 100644
index 3c80a3fca..000000000
Binary files a/android/res/drawable-hdpi/actionbar_shadow.9.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/actionbar_shadow.9.png b/android/res/drawable-mdpi/actionbar_shadow.9.png
deleted file mode 100644
index cae1778f4..000000000
Binary files a/android/res/drawable-mdpi/actionbar_shadow.9.png and /dev/null differ
diff --git a/android/res/drawable-mdpi/ic_home_carat.png b/android/res/drawable-mdpi/ic_home_carat.png
deleted file mode 100644
index 22dad56d0..000000000
Binary files a/android/res/drawable-mdpi/ic_home_carat.png and /dev/null differ
diff --git a/android/res/drawable-xhdpi/actionbar_shadow.9.png b/android/res/drawable-xhdpi/actionbar_shadow.9.png
deleted file mode 100644
index 30778e3f8..000000000
Binary files a/android/res/drawable-xhdpi/actionbar_shadow.9.png and /dev/null differ
diff --git a/android/res/drawable/actionbar_compat_item.xml b/android/res/drawable/actionbar_compat_item.xml
deleted file mode 100644
index 4b3960cf4..000000000
--- a/android/res/drawable/actionbar_compat_item.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-  Copyright 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.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/actionbar_compat_item_pressed"
-        android:state_pressed="true" />
-    <item android:drawable="@drawable/actionbar_compat_item_focused"
-        android:state_focused="true" />
-    <item android:drawable="@android:color/transparent" />
-</selector>
diff --git a/android/res/drawable/actionbar_compat_item_focused.xml b/android/res/drawable/actionbar_compat_item_focused.xml
deleted file mode 100644
index 04811d334..000000000
--- a/android/res/drawable/actionbar_compat_item_focused.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  Copyright 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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ef7000" />
-</shape>
diff --git a/android/res/drawable/actionbar_compat_item_pressed.xml b/android/res/drawable/actionbar_compat_item_pressed.xml
deleted file mode 100644
index 72ff4b4f9..000000000
--- a/android/res/drawable/actionbar_compat_item_pressed.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<!--
-  Copyright 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.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#eda700" />
-</shape>
diff --git a/android/res/drawable/home_item.xml b/android/res/drawable/home_item.xml
deleted file mode 100644
index 9afcd5a04..000000000
--- a/android/res/drawable/home_item.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<bitmap  xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/or_launcher"/>
diff --git a/android/res/layout-xlarge-land/motorbrowser.xml b/android/res/layout-xlarge-land/motorbrowser.xml
index 33c1237d5..25a2a8360 100644
--- a/android/res/layout-xlarge-land/motorbrowser.xml
+++ b/android/res/layout-xlarge-land/motorbrowser.xml
@@ -2,18 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:baselineAligned="false"
     android:orientation="horizontal" >
 
     <FrameLayout
         android:id="@+id/motorBrowserList"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_weight="4"/>
+        android:layout_weight="4" />
 
     <FrameLayout
         android:id="@+id/sidepane"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"/>
+        android:layout_weight="1" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/component_list_item.xml b/android/res/layout/component_list_item.xml
index 6956b2d01..7b12fc2d3 100644
--- a/android/res/layout/component_list_item.xml
+++ b/android/res/layout/component_list_item.xml
@@ -3,11 +3,11 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:gravity="center_vertical"
-    padding="2dip" >
+    android:padding="2dip" >
 
     <TextView
         android:id="@android:id/text1"
-        android:layout_width="fill_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:padding="4dip"
diff --git a/android/res/layout/filebrowser_list_item.xml b/android/res/layout/filebrowser_list_item.xml
index 9e8de5e71..0cee268fc 100644
--- a/android/res/layout/filebrowser_list_item.xml
+++ b/android/res/layout/filebrowser_list_item.xml
@@ -11,7 +11,7 @@
 
     <TextView
         android:id="@+id/filebrowser_list_item_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center_vertical"
diff --git a/android/res/layout/tcqueryform.xml b/android/res/layout/tcqueryform.xml
index 4295e879b..3c6d63332 100644
--- a/android/res/layout/tcqueryform.xml
+++ b/android/res/layout/tcqueryform.xml
@@ -49,6 +49,7 @@
                 android:text="@string/motor_commonname" />
 
             <EditText
+                android:inputType="text"
                 android:id="@+id/TCMotorSearchFormCommonNameField"
                 android:text="" />
         </TableRow>
diff --git a/android/res/layout/tree_list_item_wrapper.xml b/android/res/layout/tree_list_item_wrapper.xml
index ba93f47d4..7fe319618 100644
--- a/android/res/layout/tree_list_item_wrapper.xml
+++ b/android/res/layout/tree_list_item_wrapper.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent"
+    android:baselineAligned="false" >
 
     <LinearLayout
         android:id="@+id/treeview_list_item_image_layout"
@@ -19,7 +20,7 @@
 
     <FrameLayout
         android:id="@+id/treeview_list_item_frame"
-        android:layout_width="fill_parent"
+        android:layout_width="0dp"
         android:layout_height="fill_parent"
         android:layout_weight="1" >
     </FrameLayout>
diff --git a/android/res/menu/rocket_viewer_option_menu.xml b/android/res/menu/rocket_viewer_option_menu.xml
index ac2387e2e..349893b60 100644
--- a/android/res/menu/rocket_viewer_option_menu.xml
+++ b/android/res/menu/rocket_viewer_option_menu.xml
@@ -7,7 +7,7 @@
     <item
         android:id="@+id/motor_list_menu_option"
         android:icon="@drawable/ic_motorbrowser"
-        android:showAsAction="always"
+        android:showAsAction="ifRoom"
         android:title="@string/viewmotorslabel"/>
     <item
         android:id="@+id/preference_menu_option"
diff --git a/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java b/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
index c055e556b..eff07756a 100644
--- a/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
+++ b/android/src/net/sf/openrocket/android/motor/BurnPlotFragment.java
@@ -132,7 +132,7 @@ public class BurnPlotFragment extends Fragment {
 		int datasize = timePoints.length;
 		for( int i = 0; i<datasize; i++ ) {
 			series.add(timePoints[i], thrustPoints[i]);
-			int ceil = new Double(Math.ceil(thrustPoints[i])).intValue();
+			int ceil =(int) Math.ceil(thrustPoints[i]);
 			if ( ceil > maxy ) {
 				maxy = ceil;
 			}
@@ -144,7 +144,7 @@ public class BurnPlotFragment extends Fragment {
 		if ( maxx >= 2.0 ) {
 			maxx = Math.ceil(maxx);
 		} else {
-			maxx = new Double( Math.ceil(maxx*10.0) ).intValue() /10.0;
+			maxx = Math.ceil(maxx*10.0) /10.0;
 		}
 		renderer.setXAxisMax(maxx);