diff --git a/js/background.js b/js/background.js
index 8707c3a8b..094d63fee 100644
--- a/js/background.js
+++ b/js/background.js
@@ -550,6 +550,13 @@
     window.dispatchEvent(new Event('storage_ready'));
 
     window.log.info('Cleanup: starting...');
+    window.getOurDisplayName = () => {
+      const ourNumber = window.storage.get('primaryDevicePubKey');
+      const conversation = ConversationController.get(ourNumber, 'private');
+      const profile = conversation.getLokiProfile();
+      return profile && profile.displayName;
+    };
+
     const results = await Promise.all([
       window.Signal.Data.getOutgoingWithoutExpiresAt({
         MessageCollection: Whisper.MessageCollection,
@@ -690,6 +697,7 @@
 
     window.showSeedDialog = window.owsDesktopApp.appView.showSeedDialog;
     window.showPasswordDialog = window.owsDesktopApp.appView.showPasswordDialog;
+
     window.showEditProfileDialog = async callback => {
       const ourNumber = window.storage.get('primaryDevicePubKey');
       const conversation = await ConversationController.getOrCreateAndWait(
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 578604373..e2be0e221 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1995,7 +1995,7 @@
         });
       }
 
-      // if set to null, it will show a jazzIcon
+      // if set to null, it will show a placeholder with color and first letter
       await this.setProfileAvatar({ path: newProfile.avatar });
 
       await this.updateProfileName();
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 2d603f543..c595ca77b 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1517,10 +1517,6 @@
     background-color: $color-dark-70;
   }
 
-  .module-avatar {
-    background-color: $color-dark-85;
-  }
-
   &--is-blocked {
     @include themify($themes) {
       border-left: 4px solid themed('destructive') !important;
@@ -1579,7 +1575,6 @@
   text-overflow: ellipsis;
 
   font-weight: 300;
-  color: $color-gray-05;
 }
 
 .module-conversation-list-item__header__name--with-unread {
diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index 0b2a71ef5..9e90ec3a4 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -139,7 +139,7 @@ export class ConversationListItem extends React.PureComponent<Props> {
               : null
           )}
         >
-          {isMe ? i18n('noteToSelf') : this.renderUser()}
+          {this.renderUser()}
         </div>
         {this.renderUnread()}
         {
@@ -347,18 +347,19 @@ export class ConversationListItem extends React.PureComponent<Props> {
   }
 
   private renderUser() {
-    const { name, phoneNumber, profileName } = this.props;
+    const { name, phoneNumber, profileName, isMe, i18n } = this.props;
 
     const shortenedPubkey = window.shortenPubkey(phoneNumber);
 
     const displayedPubkey = profileName ? shortenedPubkey : phoneNumber;
+    const displayName = isMe ? i18n('noteToSelf') : profileName;
 
     return (
       <div className="module-conversation__user">
         <ContactName
           phoneNumber={displayedPubkey}
           name={name}
-          profileName={profileName}
+          profileName={displayName}
           module="module-conversation__user"
           i18n={window.i18n}
           boldProfileName={true}
diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index 5b799e972..03b545943 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -149,6 +149,7 @@ export class ActionsPanel extends React.Component<Props, State> {
           phoneNumber={window.storage.get('primaryDevicePubKey')}
           size={28}
           onAvatarClick={handleClick}
+          profileName={window.getOurDisplayName()}
         />
       );
     }
diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index ac0787d2a..907cd8daa 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -43,7 +43,7 @@ export async function updateProfile(
         isRaw: true,
       });
 
-      // null => use jazzicon
+      // null => use placeholder with color and first letter
       let path = null;
       if (profileKey) {
         // Convert profileKey to ArrayBuffer, if needed
diff --git a/ts/util/getInitials.ts b/ts/util/getInitials.ts
index 1b38c0984..8f7e30b5e 100644
--- a/ts/util/getInitials.ts
+++ b/ts/util/getInitials.ts
@@ -17,5 +17,5 @@ export function getInitials(name?: string): string | undefined {
     return;
   }
 
-  return initials.slice(0, 2).join('');
+  return initials[0];
 }
diff --git a/ts/window.d.ts b/ts/window.d.ts
index 52a3f7e59..51387b0d3 100644
--- a/ts/window.d.ts
+++ b/ts/window.d.ts
@@ -80,6 +80,7 @@ declare global {
     setSettingValue: any;
     shortenPubkey: any;
     showEditProfileDialog: any;
+    getOurDisplayName: () => string | undefined;
     showPasswordDialog: any;
     showSeedDialog: any;
     storage: any;