diff --git a/ts/components/ConversationListItem.tsx b/ts/components/ConversationListItem.tsx
index 0ca74ea24..eb5b428fb 100644
--- a/ts/components/ConversationListItem.tsx
+++ b/ts/components/ConversationListItem.tsx
@@ -78,13 +78,14 @@ export class ConversationListItem extends React.PureComponent<Props> {
       profileName,
       isOnline,
       isPendingFriendRequest,
+      hasSentFriendRequest,
     } = this.props;
 
     let borderColor;
-    if (!isPendingFriendRequest) {
+    if (!(isPendingFriendRequest && !hasSentFriendRequest)) {
       borderColor = isOnline ? Colors.ONLINE : Colors.OFFLINE;
     }
-    const iconSize = isPendingFriendRequest ? 28 : 48;
+    const iconSize = isPendingFriendRequest && !hasSentFriendRequest ? 28 : 48;
 
     return (
       <div className="module-conversation-list-item__avatar-container">