diff --git a/MyTracks/res/layout/list_item.xml b/MyTracks/res/layout/list_item.xml
index b5ba2f3bc..9bf821c9c 100644
--- a/MyTracks/res/layout/list_item.xml
+++ b/MyTracks/res/layout/list_item.xml
@@ -44,8 +44,7 @@ limitations under the License.
       android:paddingRight="12dp"
       android:paddingTop="8dp"
       android:shrinkColumns="1"
-      android:stretchColumns="1"
-      style="@style/ListItem" >
+      android:stretchColumns="1" >
       <!-- Table 1: Row 1 -->
       <TableRow>
         <!-- Table 1: Row 1: Column 1: (icon) -->
@@ -127,4 +126,8 @@ limitations under the License.
       </TableRow>
     </TableLayout>
   </FrameLayout>
+  <View
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    style="@style/ListItem" />
 </FrameLayout>
\ No newline at end of file
diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index 3ab15e8bc..702160288 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -43,7 +43,6 @@ limitations under the License.
     android:icon="@drawable/ic_menu_markers"
     android:id="@+id/track_detail_markers"
     android:orderInCategory="5"
-    android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
   <!-- android:orderInCategory="6" is in map.xml -->
   <item
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 43bbf2453..319b972b3 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1004,6 +1004,10 @@ limitations under the License.
     translation_description="When adding a marker, the message indicating success.">
     A marker was inserted.
   </string>
+  <string name="marker_add_canceled"
+    translation_description="When adding a marker, the message indicating it is canceled.">
+    Canceled, no marker added.
+  </string>
   <string name="marker_delete_one_confirm_message"
     translation_description="When deleting one marker, the confirmation message.">
     The marker will be permanently deleted from the device.
diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 6c625e604..d518c9002 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -317,7 +317,10 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
 
   @Override
   protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-    if (requestCode == CAMERA_REQUEST_CODE) {      
+    if (requestCode == CAMERA_REQUEST_CODE) {
+      if (resultCode == RESULT_CANCELED) {
+        Toast.makeText(this, R.string.marker_add_canceled, Toast.LENGTH_LONG).show();
+      }
       hasPhoto = resultCode == RESULT_OK;
     } else {
       super.onActivityResult(requestCode, resultCode, data);