diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 1364e7748..76a648ca4 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -243,9 +243,9 @@ class Comment extends React.Component {
       let res = [];
 
       // Adding classNames based on tags
-      Object.keys(className).map(cn => {
+      Object.keys(className).map((cn) => {
         const condition = className[cn];
-        condition.tags.forEach(tag => {
+        condition.tags.forEach((tag) => {
           if (hasTag(comment.tags, tag)) {
             res = [...res, cn];
           }
diff --git a/client/coral-embed-stream/src/components/ViewingOptions.js b/client/coral-embed-stream/src/components/ViewingOptions.js
index 8477a78ea..c40b23d39 100644
--- a/client/coral-embed-stream/src/components/ViewingOptions.js
+++ b/client/coral-embed-stream/src/components/ViewingOptions.js
@@ -2,6 +2,7 @@ import React from 'react';
 import cn from 'classnames';
 import styles from './ViewingOptions.css';
 import Slot from 'coral-framework/components/Slot';
+import {Icon} from 'coral-ui';
 
 export default class ViewingOptions extends React.Component {
   constructor() {
@@ -21,7 +22,9 @@ export default class ViewingOptions extends React.Component {
     return (
       <div className={cn([styles.viewingOptions, 'streamViewingOptions'])}>
         <div>
-          <a onClick={this.toggleOpen}>Viewing Options</a>
+          <a onClick={this.toggleOpen}>Viewing Options
+            {this.state.open ? <Icon name="arrow_drop_up"/> : <Icon name="arrow_drop_down"/>}
+          </a>
         </div>
         {
           this.state.open ? (