diff --git a/apps/comments-ui/src/components/Comment.js b/apps/comments-ui/src/components/Comment.js
index da89edf4a2..4a831d61e5 100644
--- a/apps/comments-ui/src/components/Comment.js
+++ b/apps/comments-ui/src/components/Comment.js
@@ -1,10 +1,10 @@
 import {formatRelativeTime} from '../utils/helpers';
-import {ReactComponent as LikeIcon} from '../images/icons/like.svg';
-import {ReactComponent as MoreIcon} from '../images/icons/more.svg';
 import React from 'react';
 import AppContext from '../AppContext';
-import CommentContextMenu from './modals/CommentContextMenu';
 import Avatar from './Avatar';
+import CommentContextMenu from './modals/CommentContextMenu';
+import {ReactComponent as LikeIcon} from '../images/icons/like.svg';
+import {ReactComponent as MoreIcon} from '../images/icons/more.svg';
 
 class Comment extends React.Component {
     static contextType = AppContext;
diff --git a/apps/comments-ui/src/components/Like.js b/apps/comments-ui/src/components/Like.js
index b5263f347c..cbd9c95ce7 100644
--- a/apps/comments-ui/src/components/Like.js
+++ b/apps/comments-ui/src/components/Like.js
@@ -1,8 +1,8 @@
+import {ReactComponent as LikeIcon} from '../images/icons/like.svg';
+
 function Like() {
     return (
-        <div className="mr-4 text-gray-400 text-sm font-sans">
-            4 Likes
-        </div>
+        <button className="flex font-sans mr-5"><LikeIcon className='gh-comments-icon gh-comments-icon-like mr-1' />3</button>
     );
 }
   
diff --git a/apps/comments-ui/src/components/More.js b/apps/comments-ui/src/components/More.js
index f50442c465..bccfff1650 100644
--- a/apps/comments-ui/src/components/More.js
+++ b/apps/comments-ui/src/components/More.js
@@ -1,9 +1,36 @@
-function More() {
-    return (
-        <div className="text-gray-400 text-sm font-sans">
-            More
-        </div>
-    );
+import {ReactComponent as MoreIcon} from '../images/icons/more.svg';
+import React from 'react';
+import AppContext from '../AppContext';
+import CommentContextMenu from './modals/CommentContextMenu';
+
+class More extends React.Component {
+    static contextType = AppContext;
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            isContextMenuOpen: false
+        };
+
+        this.toggleContextMenu = this.toggleContextMenu.bind(this);
+    }
+
+    toggleContextMenu() {
+        this.setState(state => ({
+            isContextMenuOpen: !state.isContextMenuOpen
+        }));
+    }
+
+    render() {
+        const comment = this.props.comment;
+
+        return (
+            <div className="relative">
+                <button onClick={this.toggleContextMenu}><MoreIcon className='gh-comments-icon gh-comments-icon-more -m-[3px]' /></button>
+                {this.state.isContextMenuOpen ? <CommentContextMenu comment={comment} /> : null}
+            </div>
+        );
+    }
 }
   
 export default More;
diff --git a/apps/comments-ui/src/components/Reply.js b/apps/comments-ui/src/components/Reply.js
index a574636a00..ac6db5e5e8 100644
--- a/apps/comments-ui/src/components/Reply.js
+++ b/apps/comments-ui/src/components/Reply.js
@@ -1,9 +1,9 @@
+import {ReactComponent as ReplyIcon} from '../images/icons/reply.svg';
+
 function Reply() {
     return (
-        <div className="mr-4 text-gray-400 text-sm font-sans">
-            Reply
-        </div>
+        <button className="flex font-sans mr-5"><ReplyIcon className='gh-comments-icon gh-comments-icon-reply mr-1' />Reply</button>
     );
 }
   
-export default Reply;
+export default Reply;
\ No newline at end of file