diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
index 64e774341..24d573733 100644
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@@ -10,6 +10,8 @@
           android:id="@+id/menu_add_attachment" />
 
     <item android:id="@+id/menu_show_map"
-        android:title="@string/menu_show_map" />
+          android:title="@string/menu_show_map"
+          android:icon="?menu_map_icon"
+          app:showAsAction="ifRoom" />
 
 </menu>
diff --git a/src/org/thoughtcrime/securesms/ProfileActivity.java b/src/org/thoughtcrime/securesms/ProfileActivity.java
index 96ddd641f..3e1361d87 100644
--- a/src/org/thoughtcrime/securesms/ProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/ProfileActivity.java
@@ -146,15 +146,15 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
       }
     }
 
-    if(!isGlobalProfile()) {
+    if(!isGlobalProfile() && !isSelfProfile()) {
       tabs.add(TAB_SETTINGS);
     }
     tabs.add(TAB_GALLERY);
     tabs.add(TAB_DOCS);
-    tabs.add(TAB_LINKS);
-    if(Prefs.isLocationStreamingEnabled(this)) {
-      tabs.add(TAB_MAP);
-    }
+    //tabs.add(TAB_LINKS);
+    //if(Prefs.isLocationStreamingEnabled(this)) {
+    //  tabs.add(TAB_MAP);
+    //}
 
     this.viewPager = ViewUtil.findById(this, R.id.pager);
     this.toolbar   = ViewUtil.findById(this, R.id.toolbar);
@@ -189,6 +189,10 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity  {
     return dcContact!=null && (dcChat==null || !dcChat.isGroup());
   }
 
+  private boolean isSelfProfile() {
+    return isContactProfile() && contactId==DcContact.DC_CONTACT_ID_SELF;
+  }
+
   private Recipient getRecipient() {
     if(dcChat!=null) {
       return dcContext.getRecipient(dcChat);