diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java b/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java
index 04d132c..1c4f33d 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/ModernInfoWindow.java
@@ -32,6 +32,7 @@
         super(R.layout.overlay_custom_bubble, mapView);
         Button editBtn = (Button) mView.findViewById(R.id.edit_poi_btn);
         if(isEditable) {
+            editBtn.setVisibility(View.VISIBLE);
             editBtn.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -39,7 +40,7 @@
                 }
             });
         } else {
-            editBtn.setVisibility(View.INVISIBLE);
+            editBtn.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/src/main/res/layout/overlay_custom_bubble.xml b/app/src/main/res/layout/overlay_custom_bubble.xml
index b4b7cbe..fdfdef3 100644
--- a/app/src/main/res/layout/overlay_custom_bubble.xml
+++ b/app/src/main/res/layout/overlay_custom_bubble.xml
@@ -37,7 +37,7 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
         <RelativeLayout
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
             <TextView
@@ -57,6 +57,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
+                android:visibility="gone"
                 android:background="@drawable/ic_map_editing_96"/>
         </RelativeLayout>
         <TextView