diff --git a/MyTracks/res/layout/choose_activity_type.xml b/MyTracks/res/layout/choose_activity_type.xml
index 68f1586a6..e906193a0 100644
--- a/MyTracks/res/layout/choose_activity_type.xml
+++ b/MyTracks/res/layout/choose_activity_type.xml
@@ -32,11 +32,12 @@ limitations under the License.
     android:layout_width="match_parent"
     android:orientation="vertical" >
     <TextView
+      android:id="@+id/choose_activity_type_weight_label"
       android:layout_marginBottom="2dp"
       android:layout_marginLeft="16dp"
       android:layout_marginRight="16dp"
       android:layout_marginTop="4dp"
-      android:text="@string/settings_stats_weight"
+      android:paddingLeft="12dp"
       style="@style/TextMedium" />
     <EditText
       android:id="@+id/choose_activity_type_weight"
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 59c071169..69c3f4d56 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -555,7 +555,15 @@ limitations under the License.
     translation_description="Label for a track segment">
     Segment
   </string>
-
+  <string name="description_weight_imperial"
+    translation_description="Label for weight in pounds.">
+    Weight (lb)
+  </string>
+  <string name="description_weight_metric"
+    translation_description="Label for weight in kilograms.">
+    Weight (kg)
+  </string>
+  
   <!-- Eula -->
   <string name="eula_accept"
     translation_description="In the 'Terms of Service' dialog, the button to accept.">
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
index 3536f28fa..155be107f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/ChooseActivityTypeDialogFragment.java
@@ -91,9 +91,15 @@ public class ChooseActivityTypeDialogFragment extends DialogFragment {
 
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
-    View view = getActivity().getLayoutInflater().inflate(R.layout.choose_activity_type, null);
+    View view = getActivity().getLayoutInflater().inflate(R.layout.choose_activity_type, null);   
     GridView gridView = (GridView) view.findViewById(R.id.choose_activity_type_grid_view);
     weightContainer = view.findViewById(R.id.choose_activity_type_weight_container);
+    
+    TextView weightLabel = (TextView) view.findViewById(R.id.choose_activity_type_weight_label);
+    weightLabel.setText(
+        PreferencesUtils.isMetricUnits(getActivity()) ? R.string.description_weight_metric
+            : R.string.description_weight_imperial);
+    
     weight = (TextView) view.findViewById(R.id.choose_activity_type_weight);
 
     List<Integer> imageIds = new ArrayList<Integer>();