diff --git a/MyTracks/res/drawable-hdpi/ic_menu_lastsegment.png b/MyTracks/res/drawable-hdpi/ic_menu_lastsegment.png
deleted file mode 100644
index b7763525b..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_lastsegment.png and /dev/null differ
diff --git a/MyTracks/res/drawable-hdpi/ic_menu_pauserecording.png b/MyTracks/res/drawable-hdpi/ic_menu_pauserecording.png
deleted file mode 100644
index f6afcf025..000000000
Binary files a/MyTracks/res/drawable-hdpi/ic_menu_pauserecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable-ldpi/ic_menu_pauserecording.png b/MyTracks/res/drawable-ldpi/ic_menu_pauserecording.png
deleted file mode 100644
index 4a0723637..000000000
Binary files a/MyTracks/res/drawable-ldpi/ic_menu_pauserecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable/appwidget_background.9.png b/MyTracks/res/drawable-mdpi/appwidget_background.9.png
similarity index 100%
rename from MyTracks/res/drawable/appwidget_background.9.png
rename to MyTracks/res/drawable-mdpi/appwidget_background.9.png
diff --git a/MyTracks/res/drawable/appwidget_button_disabled.png b/MyTracks/res/drawable-mdpi/appwidget_button_disabled.png
similarity index 100%
rename from MyTracks/res/drawable/appwidget_button_disabled.png
rename to MyTracks/res/drawable-mdpi/appwidget_button_disabled.png
diff --git a/MyTracks/res/drawable/appwidget_button_enabled.png b/MyTracks/res/drawable-mdpi/appwidget_button_enabled.png
similarity index 100%
rename from MyTracks/res/drawable/appwidget_button_enabled.png
rename to MyTracks/res/drawable-mdpi/appwidget_button_enabled.png
diff --git a/MyTracks/res/drawable/arrow_0.png b/MyTracks/res/drawable-mdpi/arrow_0.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_0.png
rename to MyTracks/res/drawable-mdpi/arrow_0.png
diff --git a/MyTracks/res/drawable/arrow_100.png b/MyTracks/res/drawable-mdpi/arrow_100.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_100.png
rename to MyTracks/res/drawable-mdpi/arrow_100.png
diff --git a/MyTracks/res/drawable/arrow_120.png b/MyTracks/res/drawable-mdpi/arrow_120.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_120.png
rename to MyTracks/res/drawable-mdpi/arrow_120.png
diff --git a/MyTracks/res/drawable/arrow_140.png b/MyTracks/res/drawable-mdpi/arrow_140.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_140.png
rename to MyTracks/res/drawable-mdpi/arrow_140.png
diff --git a/MyTracks/res/drawable/arrow_160.png b/MyTracks/res/drawable-mdpi/arrow_160.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_160.png
rename to MyTracks/res/drawable-mdpi/arrow_160.png
diff --git a/MyTracks/res/drawable/arrow_180.png b/MyTracks/res/drawable-mdpi/arrow_180.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_180.png
rename to MyTracks/res/drawable-mdpi/arrow_180.png
diff --git a/MyTracks/res/drawable/arrow_20.png b/MyTracks/res/drawable-mdpi/arrow_20.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_20.png
rename to MyTracks/res/drawable-mdpi/arrow_20.png
diff --git a/MyTracks/res/drawable/arrow_200.png b/MyTracks/res/drawable-mdpi/arrow_200.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_200.png
rename to MyTracks/res/drawable-mdpi/arrow_200.png
diff --git a/MyTracks/res/drawable/arrow_220.png b/MyTracks/res/drawable-mdpi/arrow_220.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_220.png
rename to MyTracks/res/drawable-mdpi/arrow_220.png
diff --git a/MyTracks/res/drawable/arrow_240.png b/MyTracks/res/drawable-mdpi/arrow_240.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_240.png
rename to MyTracks/res/drawable-mdpi/arrow_240.png
diff --git a/MyTracks/res/drawable/arrow_260.png b/MyTracks/res/drawable-mdpi/arrow_260.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_260.png
rename to MyTracks/res/drawable-mdpi/arrow_260.png
diff --git a/MyTracks/res/drawable/arrow_280.png b/MyTracks/res/drawable-mdpi/arrow_280.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_280.png
rename to MyTracks/res/drawable-mdpi/arrow_280.png
diff --git a/MyTracks/res/drawable/arrow_300.png b/MyTracks/res/drawable-mdpi/arrow_300.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_300.png
rename to MyTracks/res/drawable-mdpi/arrow_300.png
diff --git a/MyTracks/res/drawable/arrow_320.png b/MyTracks/res/drawable-mdpi/arrow_320.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_320.png
rename to MyTracks/res/drawable-mdpi/arrow_320.png
diff --git a/MyTracks/res/drawable/arrow_340.png b/MyTracks/res/drawable-mdpi/arrow_340.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_340.png
rename to MyTracks/res/drawable-mdpi/arrow_340.png
diff --git a/MyTracks/res/drawable/arrow_40.png b/MyTracks/res/drawable-mdpi/arrow_40.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_40.png
rename to MyTracks/res/drawable-mdpi/arrow_40.png
diff --git a/MyTracks/res/drawable/arrow_60.png b/MyTracks/res/drawable-mdpi/arrow_60.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_60.png
rename to MyTracks/res/drawable-mdpi/arrow_60.png
diff --git a/MyTracks/res/drawable/arrow_80.png b/MyTracks/res/drawable-mdpi/arrow_80.png
similarity index 100%
rename from MyTracks/res/drawable/arrow_80.png
rename to MyTracks/res/drawable-mdpi/arrow_80.png
diff --git a/MyTracks/res/drawable/blue_pushpin.png b/MyTracks/res/drawable-mdpi/blue_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable/blue_pushpin.png
rename to MyTracks/res/drawable-mdpi/blue_pushpin.png
diff --git a/MyTracks/res/drawable/googledocs_icon.png b/MyTracks/res/drawable-mdpi/googledocs_icon.png
similarity index 100%
rename from MyTracks/res/drawable/googledocs_icon.png
rename to MyTracks/res/drawable-mdpi/googledocs_icon.png
diff --git a/MyTracks/res/drawable/green_dot.png b/MyTracks/res/drawable-mdpi/green_dot.png
similarity index 100%
rename from MyTracks/res/drawable/green_dot.png
rename to MyTracks/res/drawable-mdpi/green_dot.png
diff --git a/MyTracks/res/drawable/ic_menu_chartsettings.png b/MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_chartsettings.png
rename to MyTracks/res/drawable-mdpi/ic_menu_chartsettings.png
diff --git a/MyTracks/res/drawable/ic_menu_recordtrack.png b/MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_recordtrack.png
rename to MyTracks/res/drawable-mdpi/ic_menu_recordtrack.png
diff --git a/MyTracks/res/drawable/ic_menu_sensorstatus.png b/MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_sensorstatus.png
rename to MyTracks/res/drawable-mdpi/ic_menu_sensorstatus.png
diff --git a/MyTracks/res/drawable/ic_menu_statistics.png b/MyTracks/res/drawable-mdpi/ic_menu_statistics.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_statistics.png
rename to MyTracks/res/drawable-mdpi/ic_menu_statistics.png
diff --git a/MyTracks/res/drawable/ic_menu_stoprecording.png b/MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_stoprecording.png
rename to MyTracks/res/drawable-mdpi/ic_menu_stoprecording.png
diff --git a/MyTracks/res/drawable/ic_menu_tracklist.png b/MyTracks/res/drawable-mdpi/ic_menu_tracklist.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_tracklist.png
rename to MyTracks/res/drawable-mdpi/ic_menu_tracklist.png
diff --git a/MyTracks/res/drawable/ic_menu_waypoints.png b/MyTracks/res/drawable-mdpi/ic_menu_waypoints.png
similarity index 100%
rename from MyTracks/res/drawable/ic_menu_waypoints.png
rename to MyTracks/res/drawable-mdpi/ic_menu_waypoints.png
diff --git a/MyTracks/res/drawable/left_arrow_chart.png b/MyTracks/res/drawable-mdpi/left_arrow_chart.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_chart.png
rename to MyTracks/res/drawable-mdpi/left_arrow_chart.png
diff --git a/MyTracks/res/drawable/left_arrow_chart_press.png b/MyTracks/res/drawable-mdpi/left_arrow_chart_press.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_chart_press.png
rename to MyTracks/res/drawable-mdpi/left_arrow_chart_press.png
diff --git a/MyTracks/res/drawable/left_arrow_stats.png b/MyTracks/res/drawable-mdpi/left_arrow_stats.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_stats.png
rename to MyTracks/res/drawable-mdpi/left_arrow_stats.png
diff --git a/MyTracks/res/drawable/left_arrow_stats_press.png b/MyTracks/res/drawable-mdpi/left_arrow_stats_press.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_stats_press.png
rename to MyTracks/res/drawable-mdpi/left_arrow_stats_press.png
diff --git a/MyTracks/res/drawable/left_arrow_track.png b/MyTracks/res/drawable-mdpi/left_arrow_track.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_track.png
rename to MyTracks/res/drawable-mdpi/left_arrow_track.png
diff --git a/MyTracks/res/drawable/left_arrow_track_press.png b/MyTracks/res/drawable-mdpi/left_arrow_track_press.png
similarity index 100%
rename from MyTracks/res/drawable/left_arrow_track_press.png
rename to MyTracks/res/drawable-mdpi/left_arrow_track_press.png
diff --git a/MyTracks/res/drawable/maps_icon.png b/MyTracks/res/drawable-mdpi/maps_icon.png
similarity index 100%
rename from MyTracks/res/drawable/maps_icon.png
rename to MyTracks/res/drawable-mdpi/maps_icon.png
diff --git a/MyTracks/res/drawable/menu_elevation.png b/MyTracks/res/drawable-mdpi/menu_elevation.png
similarity index 100%
rename from MyTracks/res/drawable/menu_elevation.png
rename to MyTracks/res/drawable-mdpi/menu_elevation.png
diff --git a/MyTracks/res/drawable/red_dot.png b/MyTracks/res/drawable-mdpi/red_dot.png
similarity index 100%
rename from MyTracks/res/drawable/red_dot.png
rename to MyTracks/res/drawable-mdpi/red_dot.png
diff --git a/MyTracks/res/drawable/right_arrow_chart.png b/MyTracks/res/drawable-mdpi/right_arrow_chart.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_chart.png
rename to MyTracks/res/drawable-mdpi/right_arrow_chart.png
diff --git a/MyTracks/res/drawable/right_arrow_chart_press.png b/MyTracks/res/drawable-mdpi/right_arrow_chart_press.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_chart_press.png
rename to MyTracks/res/drawable-mdpi/right_arrow_chart_press.png
diff --git a/MyTracks/res/drawable/right_arrow_stats.png b/MyTracks/res/drawable-mdpi/right_arrow_stats.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_stats.png
rename to MyTracks/res/drawable-mdpi/right_arrow_stats.png
diff --git a/MyTracks/res/drawable/right_arrow_stats_press.png b/MyTracks/res/drawable-mdpi/right_arrow_stats_press.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_stats_press.png
rename to MyTracks/res/drawable-mdpi/right_arrow_stats_press.png
diff --git a/MyTracks/res/drawable/right_arrow_track.png b/MyTracks/res/drawable-mdpi/right_arrow_track.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_track.png
rename to MyTracks/res/drawable-mdpi/right_arrow_track.png
diff --git a/MyTracks/res/drawable/right_arrow_track_press.png b/MyTracks/res/drawable-mdpi/right_arrow_track_press.png
similarity index 100%
rename from MyTracks/res/drawable/right_arrow_track_press.png
rename to MyTracks/res/drawable-mdpi/right_arrow_track_press.png
diff --git a/MyTracks/res/drawable/track.png b/MyTracks/res/drawable-mdpi/track.png
similarity index 100%
rename from MyTracks/res/drawable/track.png
rename to MyTracks/res/drawable-mdpi/track.png
diff --git a/MyTracks/res/drawable/x_axis.png b/MyTracks/res/drawable-mdpi/x_axis.png
similarity index 100%
rename from MyTracks/res/drawable/x_axis.png
rename to MyTracks/res/drawable-mdpi/x_axis.png
diff --git a/MyTracks/res/drawable/y_axis.png b/MyTracks/res/drawable-mdpi/y_axis.png
similarity index 100%
rename from MyTracks/res/drawable/y_axis.png
rename to MyTracks/res/drawable-mdpi/y_axis.png
diff --git a/MyTracks/res/drawable/ylw_pushpin.png b/MyTracks/res/drawable-mdpi/ylw_pushpin.png
similarity index 100%
rename from MyTracks/res/drawable/ylw_pushpin.png
rename to MyTracks/res/drawable-mdpi/ylw_pushpin.png
diff --git a/MyTracks/res/drawable/arrow_grey.png b/MyTracks/res/drawable/arrow_grey.png
deleted file mode 100644
index 888037955..000000000
Binary files a/MyTracks/res/drawable/arrow_grey.png and /dev/null differ
diff --git a/MyTracks/res/drawable/chart_settings.png b/MyTracks/res/drawable/chart_settings.png
deleted file mode 100644
index 63147af45..000000000
Binary files a/MyTracks/res/drawable/chart_settings.png and /dev/null differ
diff --git a/MyTracks/res/drawable/ic_menu_lastsegment.png b/MyTracks/res/drawable/ic_menu_lastsegment.png
deleted file mode 100644
index ee9c085c8..000000000
Binary files a/MyTracks/res/drawable/ic_menu_lastsegment.png and /dev/null differ
diff --git a/MyTracks/res/drawable/ic_menu_pauserecording.png b/MyTracks/res/drawable/ic_menu_pauserecording.png
deleted file mode 100644
index 37cf534b1..000000000
Binary files a/MyTracks/res/drawable/ic_menu_pauserecording.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_by_distance.png b/MyTracks/res/drawable/menu_by_distance.png
deleted file mode 100644
index 386098e55..000000000
Binary files a/MyTracks/res/drawable/menu_by_distance.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_by_time.png b/MyTracks/res/drawable/menu_by_time.png
deleted file mode 100644
index a76e94d48..000000000
Binary files a/MyTracks/res/drawable/menu_by_time.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_list_tracks.png b/MyTracks/res/drawable/menu_list_tracks.png
deleted file mode 100644
index 4b46f0ab0..000000000
Binary files a/MyTracks/res/drawable/menu_list_tracks.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_marker.png b/MyTracks/res/drawable/menu_marker.png
deleted file mode 100644
index 6a8fdaf48..000000000
Binary files a/MyTracks/res/drawable/menu_marker.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_record.png b/MyTracks/res/drawable/menu_record.png
deleted file mode 100644
index ba590da8d..000000000
Binary files a/MyTracks/res/drawable/menu_record.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_sensor_status.png b/MyTracks/res/drawable/menu_sensor_status.png
deleted file mode 100644
index 80e68b847..000000000
Binary files a/MyTracks/res/drawable/menu_sensor_status.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_stats.png b/MyTracks/res/drawable/menu_stats.png
deleted file mode 100644
index 50f52c31b..000000000
Binary files a/MyTracks/res/drawable/menu_stats.png and /dev/null differ
diff --git a/MyTracks/res/drawable/menu_stop.png b/MyTracks/res/drawable/menu_stop.png
deleted file mode 100644
index e62e796ee..000000000
Binary files a/MyTracks/res/drawable/menu_stop.png and /dev/null differ
diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index a22eab0d6..e50ae4225 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -14,93 +14,88 @@ 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.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical">
-  <TableLayout
+  android:layout_width="fill_parent" >
+
+  <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
-    android:shrinkColumns="0"
-    android:stretchColumns="0">
+    android:orientation="vertical"
+    android:padding="8dp" >
+
     <TextView
-      android:background="@drawable/list_bar"
+      android:drawableLeft="@drawable/x_axis"
+      android:drawablePadding="8dp"
+      android:gravity="bottom"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:paddingLeft="10dp"
-      android:text="@string/menu_chart_view_chart_settings"
-      android:textColor="@color/white"
-      android:textSize="20sp"/>
-  </TableLayout>
-  <ScrollView
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
-    <LinearLayout 
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/chart_settings_x_axis" />
+
+    <RadioGroup
+      android:id="@+id/chart_settings_x"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="vertical"
-      android:padding="10dp">
-      <!-- X axis -->
-      <TextView
-        android:drawableLeft="@drawable/x_axis"
-        android:drawablePadding="10dp"
-        android:text="@string/chart_settings_x_axis"
-        style="@style/ChartSettingsAxisText"/>
-      <RadioGroup
-        android:id="@+id/chart_settings_x"
+      android:layout_width="wrap_content" >
+
+      <RadioButton
+        android:id="@+id/chart_settings_by_distance"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent">
-        <RadioButton
-          android:id="@+id/chart_settings_by_distance"
-          android:text="@string/chart_settings_by_distance"
-          style="@style/ChartSettingsRadioButton"/>
-        <RadioButton
-          android:id="@+id/chart_settings_by_time"
-          android:text="@string/chart_settings_by_time"
-          style="@style/ChartSettingsRadioButton"/>
-      </RadioGroup>
-      <!-- Y axis -->
-      <TextView
-        android:drawableLeft="@drawable/y_axis"
-        android:drawablePadding="10dp"
-        android:paddingTop="10dp"
-        android:text="@string/chart_settings_y_axis"
-        style="@style/ChartSettingsAxisText"/>
-      <CheckBox
-        android:id="@+id/chart_settings_elevation"
-        android:text="@string/stat_elevation"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_speed"
-        android:text="@string/stat_speed"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_power"
-        android:text="@string/sensor_state_power"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_cadence"
-        android:text="@string/sensor_state_cadence"
-        style="@style/ChartSettingsCheckbox"/>
-      <CheckBox
-        android:id="@+id/chart_settings_heart_rate"
-        android:text="@string/sensor_state_heart_rate"
-        style="@style/ChartSettingsCheckbox"/>
-    </LinearLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/chart_settings_ok"
-      android:layout_gravity="left"
-      android:text="@string/generic_ok"
-      style="@style/Button"/>
-    <Button
-      android:id="@+id/chart_settings_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
+        android:layout_width="wrap_content"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/chart_settings_by_distance" />
+
+      <RadioButton
+        android:id="@+id/chart_settings_by_time"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/chart_settings_by_time" />
+    </RadioGroup>
+
+    <TextView
+      android:drawableLeft="@drawable/y_axis"
+      android:drawablePadding="8dp"
+      android:gravity="bottom"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Large"
+      android:text="@string/chart_settings_y_axis" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_elevation"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/stat_elevation" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_speed"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/stat_speed" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_power"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_power" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_cadence"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_cadence" />
+
+    <CheckBox
+      android:id="@+id/chart_settings_heart_rate"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      style="@android:style/TextAppearance.DeviceDefault.Medium"
+      android:text="@string/sensor_state_heart_rate" />
   </LinearLayout>
-</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/layout/upload_service_chooser.xml b/MyTracks/res/layout/upload_service_chooser.xml
index ca750d794..599f5f421 100644
--- a/MyTracks/res/layout/upload_service_chooser.xml
+++ b/MyTracks/res/layout/upload_service_chooser.xml
@@ -14,93 +14,92 @@ 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.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical">
-  <TextView
-    android:background="@drawable/list_bar"
+  android:layout_width="fill_parent" >
+
+  <TableLayout
     android:layout_height="wrap_content"
+    android:layout_margin="8dp"
     android:layout_width="fill_parent"
-    android:paddingLeft="10dp"
-    android:text="@string/send_google_title"
-    android:textColor="@color/white"
-    android:textSize="20sp"/>
-  <ScrollView
-    android:layout_height="0dp"
-    android:layout_margin="5dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:stretchColumns="1">
+    android:stretchColumns="1" >
 
-      <!-- Google Maps -->
-      <TableRow android:id="@+id/send_google_maps_row">
-        <ImageView
-          android:contentDescription="@string/send_google_maps"
-          android:src="@drawable/maps_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_maps"
-          android:text="@string/send_google_maps"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-      <TableRow android:id="@+id/send_google_maps_option_row">
-        <RadioGroup
-          android:layout_column="1"
+    <TableRow android:id="@+id/send_google_maps_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_maps"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/maps_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_maps"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_maps" />
+    </TableRow>
+
+    <TableRow android:id="@+id/send_google_maps_option_row" >
+
+      <RadioGroup
+        android:layout_column="1"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp" >
+
+        <RadioButton
+          android:id="@+id/send_google_new_map"
           android:layout_height="wrap_content"
-          android:layout_marginLeft="10dp"
-          android:layout_width="0dp">
-          <RadioButton
-            android:id="@+id/send_google_new_map"
-            android:text="@string/send_google_new_map"
-            style="@style/SendGoogleRadioButton"/>
-          <RadioButton
-            android:id="@+id/send_google_existing_map"
-            android:text="@string/send_google_existing_map"
-            style="@style/SendGoogleRadioButton"/>
-        </RadioGroup>
-      </TableRow>
+          android:layout_width="wrap_content"
+          style="@android:style/TextAppearance.DeviceDefault.Medium"
+          android:text="@string/send_google_new_map" />
 
-      <!-- Google Fusion Tables -->
-      <TableRow android:id="@+id/send_google_fusion_tables_row">
-        <ImageView
-          android:contentDescription="@string/send_google_fusion_tables"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_fusion_tables"
-          android:text="@string/send_google_fusion_tables"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
+        <RadioButton
+          android:id="@+id/send_google_existing_map"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          style="@android:style/TextAppearance.DeviceDefault.Medium"
+          android:text="@string/send_google_existing_map" />
+      </RadioGroup>
+    </TableRow>
 
-      <!-- Google Docs -->
-      <TableRow android:id="@+id/send_google_docs_row">
-        <ImageView
-          android:contentDescription="@string/send_google_docs"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_docs"
-          android:text="@string/send_google_docs"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-    </TableLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/send_google_send_now"
-      android:layout_gravity="left"
-      android:text="@string/send_google_send_now"
-      style="@style/Button"/>
-    <Button
-      android:id="@+id/send_google_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
-</LinearLayout>
+    <TableRow android:id="@+id/send_google_fusion_tables_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_fusion_tables"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_fusion_tables"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_fusion_tables" />
+    </TableRow>
+    <TableRow android:id="@+id/send_google_docs_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_docs"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_docs"
+        android:layout_gravity="center_vertical"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_docs" />
+    </TableRow>
+  </TableLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/menu/main.xml b/MyTracks/res/menu/main.xml
index bbef87da1..76be5e18e 100644
--- a/MyTracks/res/menu/main.xml
+++ b/MyTracks/res/menu/main.xml
@@ -41,7 +41,7 @@ limitations under the License.
     android:title="@string/menu_markers"/>
 
   <item
-    android:icon="@drawable/chart_settings"
+    android:icon="@drawable/ic_menu_chartsettings"
     android:id="@+id/menu_chart_settings"
     android:showAsAction="ifRoom"
     android:title="@string/menu_chart_view_chart_settings"
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 8155c6d9f..5d4dc2dec 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1292,6 +1292,11 @@ limitations under the License.
       found.">
     No account found
   </string>
+  <string name="send_google_no_service_selected"
+    translation_description="When sending a track to Google, a message indicating that the user has
+      not selected any Google service and no data is sent.">
+    You did not select any service. No data is sent.
+  </string>
   <string name="send_google_progress_title"
     translation_description="When sending a track to a Google service, the title on the progress
       dialog.
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 15cb3ec90..33d76d8b3 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -47,49 +47,6 @@ limitations under the License.
     <item name="android:visibility">gone</item>
   </style>
 
-  <!-- Chart settings axis text -->
-  <style name="ChartSettingsAxisText">
-    <item name="android:gravity">bottom</item>
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textSize">20sp</item>
-  </style>
-
-  <!-- Chart settings checkbox -->
-  <style name="ChartSettingsCheckbox">
-    <item name="android:checked">true</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-
-  <!-- Chart settings radio button -->
-  <style name="ChartSettingsRadioButton">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-
-  <!-- Send Google CheckBox -->
-  <style name="SendGoogleCheckBox">
-    <item name="android:checked">true</item>
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_marginLeft">10dp</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
-  <!-- Send Google ImageView -->
-  <style name="SendGoogleImageView">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-
-  <!-- Send Google RadioButton -->
-  <style name="SendGoogleRadioButton">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
   <style name="SensorStateLabel">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">fill_parent</item>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index 3f57ce45d..68386fb58 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -35,9 +35,9 @@ import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
 import android.location.Location;
 import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
@@ -45,7 +45,9 @@ import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
+import android.widget.CheckBox;
 import android.widget.LinearLayout;
+import android.widget.RadioGroup;
 import android.widget.ZoomControls;
 
 import java.util.ArrayList;
@@ -59,7 +61,7 @@ import java.util.EnumSet;
  */
 public class ChartActivity extends Activity implements TrackDataListener {
 
-  public static final int CHART_SETTINGS_DIALOG = 1;
+  private static final int DIALOG_CHART_SETTINGS_ID = 0;
 
   private final DoubleBuffer elevationBuffer =
       new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
@@ -185,43 +187,60 @@ public class ChartActivity extends Activity implements TrackDataListener {
 
   @Override
   protected Dialog onCreateDialog(int id) {
-    if (id == CHART_SETTINGS_DIALOG) {
-      final ChartSettingsDialog settingsDialog = new ChartSettingsDialog(this);
-      settingsDialog.setOnClickListener(new OnClickListener() {
-        @Override
-        public void onClick(DialogInterface arg0, int which) {
-          if (which != DialogInterface.BUTTON_POSITIVE) {
-            return;
-          }
+    switch (id) {
+      case DIALOG_CHART_SETTINGS_ID:
+        View view = getLayoutInflater().inflate(R.layout.chart_settings, null);
+        final RadioGroup radioGroup = (RadioGroup) view.findViewById(R.id.chart_settings_x);
+        radioGroup.check(chartView.getMode() == Mode.BY_DISTANCE 
+            ? R.id.chart_settings_by_distance : R.id.chart_settings_by_time);
 
-          for (int i = 0; i < ChartView.NUM_SERIES; i++) {
-            chartView.setChartValueSeriesEnabled(i, settingsDialog.isSeriesEnabled(i));
-          }
-          setMode(settingsDialog.getMode());
-          chartView.postInvalidate();
+        final CheckBox[] checkBoxes = new CheckBox[ChartView.NUM_SERIES];
+        checkBoxes[ChartView.ELEVATION_SERIES] = (CheckBox) view.findViewById(
+            R.id.chart_settings_elevation);
+        checkBoxes[ChartView.SPEED_SERIES] = (CheckBox) view.findViewById(
+            R.id.chart_settings_speed);
+        checkBoxes[ChartView.POWER_SERIES] = (CheckBox) view.findViewById(
+            R.id.chart_settings_power);
+        checkBoxes[ChartView.CADENCE_SERIES] = (CheckBox) view.findViewById(
+            R.id.chart_settings_cadence);
+        checkBoxes[ChartView.HEART_RATE_SERIES] = (CheckBox) view.findViewById(
+            R.id.chart_settings_heart_rate);
+
+        // set checkboxes values
+        for (int i = 0; i < ChartView.NUM_SERIES; i++) {
+          checkBoxes[i].setChecked(chartView.isChartValueSeriesEnabled(i));
         }
-      });
-      return settingsDialog;
-    }
-
-    return super.onCreateDialog(id);
-  }
-
-  @Override
-  protected void onPrepareDialog(int id, Dialog dialog) {
-    super.onPrepareDialog(id, dialog);
-
-    if (id == CHART_SETTINGS_DIALOG) {
-      prepareSettingsDialog((ChartSettingsDialog) dialog);
+        checkBoxes[ChartView.SPEED_SERIES]
+            .setText(reportSpeed ? R.string.stat_speed : R.string.stat_pace);
+        
+        return new AlertDialog.Builder(this)
+            .setCancelable(true)
+            .setNegativeButton(R.string.generic_cancel, null)
+            .setPositiveButton(R.string.generic_ok, new DialogInterface.OnClickListener() {
+              @Override
+              public void onClick(DialogInterface dialog, int which) {
+                setMode(radioGroup.getCheckedRadioButtonId() == R.id.chart_settings_by_distance
+                    ? Mode.BY_DISTANCE
+                    : Mode.BY_TIME);
+                for (int i = 0; i < ChartView.NUM_SERIES; i++) {
+                  chartView.setChartValueSeriesEnabled(i, checkBoxes[i].isChecked());
+                }
+                chartView.postInvalidate();
+              }
+            })
+            .setTitle(R.string.menu_chart_view_chart_settings)
+            .setView(view)
+            .create();
+      default:
+        return null;
     }
   }
 
-  private void prepareSettingsDialog(ChartSettingsDialog settingsDialog) {
-    settingsDialog.setMode(chartView.getMode());
-    settingsDialog.setDisplaySpeed(reportSpeed);
-    for (int i = 0; i < ChartView.NUM_SERIES; i++) {
-      settingsDialog.setSeriesEnabled(i, chartView.isChartValueSeriesEnabled(i));
-    }
+  /**
+   * Shows the chart settings dialog
+   */
+  public void showChartSettingsDialog() {
+    showDialog(DIALOG_CHART_SETTINGS_ID);
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartSettingsDialog.java b/MyTracks/src/com/google/android/apps/mytracks/ChartSettingsDialog.java
deleted file mode 100644
index 14b22a8b2..000000000
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartSettingsDialog.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright 2009 Google Inc.
- *
- * 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.
- */
-package com.google.android.apps.mytracks;
-
-import com.google.android.apps.mytracks.ChartView.Mode;
-import com.google.android.maps.mytracks.R;
-import com.google.common.annotations.VisibleForTesting;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.RadioButton;
-import android.widget.RadioGroup;
-
-/**
- * An activity that allows the user to set the chart settings.
- *
- * @author Sandor Dornbush
- */
-public class ChartSettingsDialog extends Dialog {
-  private RadioButton distance;
-  private CheckBox[] series;
-  private OnClickListener clickListener;
-
-  public ChartSettingsDialog(Context context) {
-    super(context);
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    requestWindowFeature(Window.FEATURE_NO_TITLE);
-    setContentView(R.layout.chart_settings);
-    Button cancel = (Button) findViewById(R.id.chart_settings_cancel);
-    cancel.setOnClickListener(new View.OnClickListener() {
-      public void onClick(View v) {
-        if (clickListener != null) {
-          clickListener.onClick(ChartSettingsDialog.this, BUTTON_NEGATIVE);
-        }
-        dismiss();
-      }
-    });
-
-    Button okButton = (Button) findViewById(R.id.chart_settings_ok);
-    okButton.setOnClickListener(new View.OnClickListener() {
-      public void onClick(View v) {
-        if (clickListener != null) {
-          clickListener.onClick(ChartSettingsDialog.this, BUTTON_POSITIVE);
-        }
-        dismiss();
-      }
-    });
-
-    distance = (RadioButton) findViewById(R.id.chart_settings_by_distance);
-
-    series = new CheckBox[ChartView.NUM_SERIES];
-    series[ChartView.ELEVATION_SERIES] =
-        (CheckBox) findViewById(R.id.chart_settings_elevation);
-    series[ChartView.SPEED_SERIES] =
-        (CheckBox) findViewById(R.id.chart_settings_speed);
-    series[ChartView.POWER_SERIES] =
-        (CheckBox) findViewById(R.id.chart_settings_power);
-    series[ChartView.CADENCE_SERIES] =
-        (CheckBox) findViewById(R.id.chart_settings_cadence);
-    series[ChartView.HEART_RATE_SERIES] =
-        (CheckBox) findViewById(R.id.chart_settings_heart_rate);
-  }
-
-  public void setMode(Mode mode) {
-    RadioGroup rd = (RadioGroup) findViewById(R.id.chart_settings_x);
-    rd.check(mode == Mode.BY_DISTANCE
-             ? R.id.chart_settings_by_distance
-             : R.id.chart_settings_by_time);
-  }
-  
-  /**
-   * Sets whether to display speed or pace.
-   * 
-   * @param displaySpeed true to display speed
-   */
-  public void setDisplaySpeed(boolean displaySpeed) {
-    series[ChartView.SPEED_SERIES].setText(displaySpeed ? R.string.stat_speed : R.string.stat_pace);
-  }
-
-  public void setSeriesEnabled(int seriesIdx, boolean enabled) {
-    series[seriesIdx].setChecked(enabled);
-  }
-
-  public Mode getMode() {
-    if (distance == null) return Mode.BY_DISTANCE;
-
-    return distance.isChecked() ? Mode.BY_DISTANCE : Mode.BY_TIME;
-  }
-
-  public boolean isSeriesEnabled(int seriesIdx) {
-    if (series == null) return true;
-
-    return series[seriesIdx].isChecked();
-  }
-
-  public void setOnClickListener(OnClickListener clickListener) {
-    this.clickListener = clickListener;
-  }
-  
-  @VisibleForTesting
-  CheckBox[] getSeries() {
-    return series;
-  }
-}
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index cb9c97d83..3fd22109a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -167,7 +167,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
             android.R.drawable.ic_menu_mapmode))
         .setContent(new Intent(this, MapActivity.class)));
     tabHost.addTab(tabHost.newTabSpec(STATS_TAB_TAG)
-        .setIndicator("Stats", res.getDrawable(R.drawable.menu_stats))
+        .setIndicator("Stats", res.getDrawable(R.drawable.ic_menu_statistics))
         .setContent(new Intent(this, StatsActivity.class)));
     tabHost.addTab(tabHost.newTabSpec(CHART_TAB_TAG)
         .setIndicator("Chart", res.getDrawable(R.drawable.menu_elevation))
@@ -540,7 +540,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   public void showChartSettings() {
     ChartActivity chart = getChartTab();
     if (chart != null) {
-      chart.showDialog(ChartActivity.CHART_SETTINGS_DIALOG);
+      chart.showChartSettingsDialog();
     }
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
index 5a18b927b..0e0433cb7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
@@ -22,6 +22,7 @@ import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -30,27 +31,26 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.view.View;
-import android.view.Window;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.RadioButton;
 import android.widget.TableRow;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 
 /**
  * A chooser to select the Google services to upload a track to.
- *
+ * 
  * @author Jimmy Shih
  */
 public class UploadServiceChooserActivity extends Activity {
 
-  private static final int SERVICE_PICKER_DIALOG = 1;
+  private static final int DIALOG_CHOOSER_ID = 0;
 
   private SendRequest sendRequest;
-  private Dialog dialog;
+  private AlertDialog alertDialog;
 
   private TableRow mapsTableRow;
   private TableRow fusionTablesTableRow;
@@ -64,9 +64,6 @@ public class UploadServiceChooserActivity extends Activity {
   private RadioButton newMapRadioButton;
   private RadioButton existingMapRadioButton;
 
-  private Button cancel;
-  private Button send;
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -76,35 +73,26 @@ public class UploadServiceChooserActivity extends Activity {
   @Override
   protected void onResume() {
     super.onResume();
-    showDialog(SERVICE_PICKER_DIALOG);
+    showDialog(DIALOG_CHOOSER_ID);
   }
 
   @Override
   protected Dialog onCreateDialog(int id) {
     switch (id) {
-      case SERVICE_PICKER_DIALOG:
-        dialog = new Dialog(this);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(R.layout.upload_service_chooser);
-        dialog.setCancelable(true);
-        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-          @Override
-          public void onCancel(DialogInterface d) {
-            finish();
-          }
-        });
+      case DIALOG_CHOOSER_ID:
+        View view = getLayoutInflater().inflate(R.layout.upload_service_chooser, null);
 
-        mapsTableRow = (TableRow) dialog.findViewById(R.id.send_google_maps_row);
-        fusionTablesTableRow = (TableRow) dialog.findViewById(R.id.send_google_fusion_tables_row);
-        docsTableRow = (TableRow) dialog.findViewById(R.id.send_google_docs_row);
+        mapsTableRow = (TableRow) view.findViewById(R.id.send_google_maps_row);
+        fusionTablesTableRow = (TableRow) view.findViewById(R.id.send_google_fusion_tables_row);
+        docsTableRow = (TableRow) view.findViewById(R.id.send_google_docs_row);
 
-        mapsCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_maps);
-        fusionTablesCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_fusion_tables);
-        docsCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_docs);
+        mapsCheckBox = (CheckBox) view.findViewById(R.id.send_google_maps);
+        fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.send_google_fusion_tables);
+        docsCheckBox = (CheckBox) view.findViewById(R.id.send_google_docs);
 
-        mapsOptionTableRow = (TableRow) dialog.findViewById(R.id.send_google_maps_option_row);
-        newMapRadioButton = (RadioButton) dialog.findViewById(R.id.send_google_new_map);
-        existingMapRadioButton = (RadioButton) dialog.findViewById(R.id.send_google_existing_map);
+        mapsOptionTableRow = (TableRow) view.findViewById(R.id.send_google_maps_option_row);
+        newMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_new_map);
+        existingMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_existing_map);
 
         // Setup checkboxes
         OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() {
@@ -116,31 +104,48 @@ public class UploadServiceChooserActivity extends Activity {
         fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener);
         docsCheckBox.setOnCheckedChangeListener(checkBoxListener);
 
-        // Setup buttons
-        cancel = (Button) dialog.findViewById(R.id.send_google_cancel);
-        cancel.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
-            finish();
-          }
-        });
-        send = (Button) dialog.findViewById(R.id.send_google_send_now);
-        send.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
-            saveState();
-            startNextActivity();
-          }
-        });
-
         // Setup initial state
         initState();
 
         // Update state based on sendRequest
         updateStateBySendRequest();
 
-        // Update state based on current user selection
+        // Update state based on current selection
         updateStateBySelection();
 
-        return dialog;
+        alertDialog = new AlertDialog.Builder(this)
+            .setCancelable(true)
+            .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() {
+                @Override
+              public void onClick(DialogInterface dialog, int which) {
+                finish();
+              }
+            })
+            .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                @Override
+              public void onCancel(DialogInterface d) {
+                finish();
+              }
+            })
+            .setPositiveButton(
+                R.string.send_google_send_now, new DialogInterface.OnClickListener() {
+
+                    @Override
+                  public void onClick(DialogInterface dialog, int which) {
+                    saveState();
+                    if (sendMaps() || sendFusionTables() || sendDocs()) {
+                      startNextActivity();
+                    } else {
+                      Toast.makeText(UploadServiceChooserActivity.this,
+                          R.string.send_google_no_service_selected, Toast.LENGTH_LONG).show();
+                      finish();
+                    }
+                  }
+                })
+            .setTitle(R.string.send_google_title)
+            .setView(view)
+            .create();
+        return alertDialog;
       default:
         return null;
     }
@@ -186,7 +191,6 @@ public class UploadServiceChooserActivity extends Activity {
    */
   private void updateStateBySelection() {
     mapsOptionTableRow.setVisibility(sendMaps() ? View.VISIBLE : View.GONE);
-    send.setEnabled(sendMaps() || sendFusionTables() || sendDocs());
   }
 
   /**
@@ -242,7 +246,7 @@ public class UploadServiceChooserActivity extends Activity {
     startActivity(intent);
     finish();
   }
-  
+
   /**
    * Sends stats to Google Analytics.
    */
@@ -259,12 +263,12 @@ public class UploadServiceChooserActivity extends Activity {
     }
     AnalyticsUtils.sendPageViews(this, pages.toArray(new String[pages.size()]));
   }
-  
+
   @VisibleForTesting
-  Dialog getDialog() {
-    return dialog;
+  AlertDialog getAlertDialog() {
+    return alertDialog;
   }
-  
+
   @VisibleForTesting
   SendRequest getSendRequest() {
     return sendRequest;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/ChartSettingsDialogTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/ChartSettingsDialogTest.java
deleted file mode 100644
index fbe277c53..000000000
--- a/MyTracksTest/src/com/google/android/apps/mytracks/ChartSettingsDialogTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2012 Google Inc.
- *
- * 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.
- */
-package com.google.android.apps.mytracks;
-
-import com.google.android.apps.mytracks.ChartView.Mode;
-import com.google.android.maps.mytracks.R;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-/**
- * Tests the {@link ChartSettingsDialog}.
- * 
- * @author Youtao Liu
- */
-public class ChartSettingsDialogTest extends ActivityInstrumentationTestCase2<ChartActivity> {
-
-  private ChartSettingsDialog chartSettingsDialog;
-
-  public ChartSettingsDialogTest() {
-    super(ChartActivity.class);
-  }
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    chartSettingsDialog = new ChartSettingsDialog(getActivity());
-    chartSettingsDialog.show();
-  }
-
-  /**
-   * Tests the {@link ChartSettingsDialog#setMode} and check the result by
-   * {@link ChartSettingsDialog#getMode}. Gets all modes of Mode, then set and
-   * get each mode.
-   */
-  public void testSetMode() {
-    Mode[] modes = Mode.values();
-    for (Mode mode : modes) {
-      chartSettingsDialog.setMode(mode);
-      assertEquals(mode, chartSettingsDialog.getMode());
-    }
-  }
-
-  /**
-   * Tests the {@link ChartSettingsDialog#setDisplaySpeed}.
-   */
-  public void testSetDisplaySpeed() {
-    chartSettingsDialog.setDisplaySpeed(true);
-    assertEquals(getActivity().getString(R.string.stat_speed),
-        chartSettingsDialog.getSeries()[ChartView.SPEED_SERIES].getText());
-    chartSettingsDialog.setDisplaySpeed(false);
-    assertEquals(getActivity().getString(R.string.stat_pace),
-        chartSettingsDialog.getSeries()[ChartView.SPEED_SERIES].getText());
-  }
-
-  /**
-   * Tests the {@link ChartSettingsDialog#setSeriesEnabled} and check the result
-   * by {@link ChartSettingsDialog#isSeriesEnabled}.
-   */
-  public void testSetSeriesEnabled() {
-    for (int i = 0; i < ChartView.NUM_SERIES; i++) {
-      chartSettingsDialog.setSeriesEnabled(i, true);
-      assertEquals(true, chartSettingsDialog.getSeries()[i].isChecked());
-      assertEquals(true, chartSettingsDialog.isSeriesEnabled(i));
-      chartSettingsDialog.setSeriesEnabled(i, false);
-      assertEquals(false, chartSettingsDialog.getSeries()[i].isChecked());
-      assertEquals(false, chartSettingsDialog.isSeriesEnabled(i));
-    }
-  }
-}
\ No newline at end of file
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
index 50f5dd020..a4ca0b177 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.test.ActivityInstrumentationTestCase2;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 
@@ -59,7 +58,6 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getFusionTablesCheckBox().isShown());
     assertTrue(getDocsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     // Clicks to disable all send items.
     uploadServiceChooserActivity.runOnUiThread(new Runnable() {
@@ -79,11 +77,9 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getFusionTablesCheckBox().isShown());
     assertTrue(getDocsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     assertFalse(getNewMapRadioButton().isShown());
     assertFalse(getExistingMapRadioButton().isShown());
-    assertFalse(getSendButton().isEnabled());
   }
 
   /**
@@ -94,7 +90,6 @@ public class UploadServiceChooserActivityTest extends
     initialActivity(true, false, false);
     instrumentation.waitForIdleSync();
     assertTrue(getMapsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     // Clicks to enable this items.
     uploadServiceChooserActivity.runOnUiThread(new Runnable() {
@@ -108,8 +103,6 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getNewMapRadioButton().isShown());
     assertTrue(getExistingMapRadioButton().isShown());
-    assertTrue(getSendButton().isEnabled());
-    assertTrue(getCancelButton().isEnabled());
   }
 
   /**
@@ -120,8 +113,6 @@ public class UploadServiceChooserActivityTest extends
     assertFalse(getMapsCheckBox().isShown());
     assertFalse(getFusionTablesCheckBox().isShown());
     assertFalse(getDocsCheckBox().isShown());
-    assertFalse(getSendButton().isEnabled());
-    assertTrue(getCancelButton().isEnabled());
   }
 
   /**
@@ -259,35 +250,26 @@ public class UploadServiceChooserActivityTest extends
     uploadServiceChooserActivity = this.getActivity();
   }
 
-  private Button getSendButton() {
-    return (Button) uploadServiceChooserActivity.getDialog()
-        .findViewById(R.id.send_google_send_now);
-  }
-
-  Button getCancelButton() {
-    return (Button) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_cancel);
-  }
-
   private CheckBox getMapsCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_maps);
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(R.id.send_google_maps);
   }
 
   private CheckBox getFusionTablesCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_fusion_tables);
   }
 
   private CheckBox getDocsCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_docs);
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(R.id.send_google_docs);
   }
 
   private RadioButton getNewMapRadioButton() {
-    return (RadioButton) uploadServiceChooserActivity.getDialog().findViewById(
+    return (RadioButton) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_new_map);
   }
 
   private RadioButton getExistingMapRadioButton() {
-    return (RadioButton) uploadServiceChooserActivity.getDialog().findViewById(
+    return (RadioButton) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_existing_map);
   }
 }