diff --git a/android/res/layout/add_or_edit_bookmark.xml b/android/res/layout/add_or_edit_bookmark.xml
index 9cd5ef2760..9bbe2cc387 100644
--- a/android/res/layout/add_or_edit_bookmark.xml
+++ b/android/res/layout/add_or_edit_bookmark.xml
@@ -71,32 +71,16 @@
 
             <include layout="@layout/green_separator" />
 
-            <LinearLayout
+
+            <TextView
+                android:id="@+id/pin_set_chooser"
+                style="@style/pinEditableParam"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/dp_x_4"
-                android:gravity="bottom"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/pin_set_chooser"
-                    style="@style/pinEditableParam"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="0dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/spinner_background_holo_light"
-                    android:focusable="false" />
-
-                <ImageView
-                    android:id="@+id/color_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    android:background="@drawable/spinner_background_holo_light"
-                    android:paddingLeft="@dimen/dp_x_4"
-                    android:src="@drawable/ic_location" />
-            </LinearLayout>
+                android:layout_weight="1"
+                android:background="@drawable/spinner_background_holo_light"
+                android:focusable="false" />
 
             <!-- DESCR -->
 
diff --git a/android/src/com/mapswithme/maps/widget/MapInfoView.java b/android/src/com/mapswithme/maps/widget/MapInfoView.java
index df90f61c06..c73205a010 100644
--- a/android/src/com/mapswithme/maps/widget/MapInfoView.java
+++ b/android/src/com/mapswithme/maps/widget/MapInfoView.java
@@ -738,9 +738,11 @@ public class MapInfoView extends LinearLayout implements View.OnClickListener
       break;
     case R.id.info_box_back_to_caller:
       ParsedMmwRequest.getCurrentRequest().sendResponseAndFinish((Activity) getContext(), true);
+      break;
     case R.id.btn_edit_title:
       Bookmark bmk = (Bookmark) mMapObject;
       BookmarkActivity.startWithBookmark(getContext(), bmk.getCategoryId(), bmk.getBookmarkId());
+      break;
     case R.id.btn_route_from:
       Framework.nativeSetRouteStart(mMapObject.getLat(), mMapObject.getLon());
       break;