diff --git a/res/drawable/icon_seedling.xml b/res/drawable/icon_seedling.xml
new file mode 100644
index 0000000000..820b0b2617
--- /dev/null
+++ b/res/drawable/icon_seedling.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="512"
+    android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group
+        android:scaleX="0.88"
+        android:scaleY="0.88"
+        android:translateX="64">
+        <path android:fillColor="?attr/pref_icon_tint" android:pathData="M64,96L0,96c0,123.7 100.3,224 224,224v144c0,8.8 7.2,16 16,16h32c8.8,0 16,-7.2 16,-16L288,320C288,196.3 187.7,96 64,96zM448,32c-84.2,0 -157.4,46.5 -195.7,115.2 27.7,30.2 48.2,66.9 59,107.6C424,243.1 512,147.9 512,32h-64z"/>
+    </group>
+</vector>
diff --git a/res/drawable/icon_share.xml b/res/drawable/icon_share.xml
new file mode 100644
index 0000000000..afa355e8e2
--- /dev/null
+++ b/res/drawable/icon_share.xml
@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="512"
+    android:viewportWidth="448" android:width="21dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group
+        android:scaleX="0.88"
+        android:scaleY="0.88"
+        android:translateX="56">
+        <path android:fillColor="?attr/pref_icon_tint" android:pathData="M352,320c-22.608,0 -43.387,7.819 -59.79,20.895l-102.486,-64.054a96.551,96.551 0,0 0,0 -41.683l102.486,-64.054C308.613,184.181 329.392,192 352,192c53.019,0 96,-42.981 96,-96S405.019,0 352,0s-96,42.981 -96,96c0,7.158 0.79,14.13 2.276,20.841L155.79,180.895C139.387,167.819 118.608,160 96,160c-53.019,0 -96,42.981 -96,96s42.981,96 96,96c22.608,0 43.387,-7.819 59.79,-20.895l102.486,64.054A96.301,96.301 0,0 0,256 416c0,53.019 42.981,96 96,96s96,-42.981 96,-96 -42.981,-96 -96,-96z"/>
+    </group>
+</vector>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5eeb3568f7..6dd209dc70 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -35,10 +35,10 @@
 
     <Preference android:key="preference_category_public_key"
                 android:title="@string/activity_settings_share_public_key_button_title"
-                android:icon="@drawable/ic_textsms_24dp"/>
+                android:icon="@drawable/icon_share"/>
 
     <Preference android:key="preference_category_seed"
                 android:title="@string/activity_settings_show_seed_button_title"
-                android:icon="@drawable/ic_security_24dp"/>
+                android:icon="@drawable/icon_seedling"/>
 
 </PreferenceScreen>
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
index e2afb38192..5c56ef6d49 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
@@ -8,6 +8,7 @@ import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -78,6 +79,8 @@ public class ProfilePreference extends Preference {
       profileNameView.setText(profileName);
     }
 
+    profileNameView.setVisibility(TextUtils.isEmpty(profileName) ? View.GONE : View.VISIBLE);
+
     profileNumberView.setText(localAddress.toPhoneString());
   }
 }