diff --git a/forge.config.js b/forge.config.js
index ec2275b6..1e2d745a 100644
--- a/forge.config.js
+++ b/forge.config.js
@@ -55,7 +55,7 @@ module.exports = {
             "node_modules/fs-ext/**",
             "node_modules/fsevents/**",
         ],
-        icon: "static/PromptIcon.icns",
+        icon: "icon/Prompt.icns",
         osxNotarize: {
             tool: "notarytool",
             keychainProfile: "notarytool-creds",
diff --git a/icon/Prompt.icns b/icon/Prompt.icns
new file mode 100644
index 00000000..b909f236
Binary files /dev/null and b/icon/Prompt.icns differ
diff --git a/icon/Prompt.iconset.zip b/icon/Prompt.iconset.zip
new file mode 100644
index 00000000..c1178083
Binary files /dev/null and b/icon/Prompt.iconset.zip differ
diff --git a/src/main.tsx b/src/main.tsx
index 5ac5dbe5..19879a6e 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -173,12 +173,9 @@ class LineText extends React.Component<{sw : ScreenWindow, line : LineType}, {}>
         return (
             <div className="line line-text" data-lineid={line.lineid} data-linenum={line.linenum} data-windowid={line.windowid} onClick={this.clickHandler}>
                 <div className={cn("focus-indicator", {"selected": isSelected}, {"active": isSelected && isFocused})}/>
-                <div className="avatar">
-                    S
-                </div>
+                <LineAvatar line={line}/>
                 <div className="line-content">
                     <div className="meta">
-                        <div className="user">{line.userid}</div>
                         <div className="ts">{formattedTime}</div>
                     </div>
                     <div className="text">