diff --git a/packages/app/client/src/ui/editor/emulator/emulator.tsx b/packages/app/client/src/ui/editor/emulator/emulator.tsx
index 17721abf2..6e09d855f 100644
--- a/packages/app/client/src/ui/editor/emulator/emulator.tsx
+++ b/packages/app/client/src/ui/editor/emulator/emulator.tsx
@@ -57,6 +57,11 @@ import { ToolBar } from './toolbar/toolbar';
 
 const { encode } = base64Url;
 
+const RestartConversationOptions = {
+  NewUserId: 'Restart with new user ID',
+  SameUserId: 'Restart with same user ID'
+};
+
 export type EmulatorMode = 'transcript' | 'livechat';
 
 interface EmulatorProps {
@@ -264,7 +269,7 @@ class EmulatorComponent extends React.Component<EmulatorProps, {}> {
               <SplitButton 
                 defaultLabel="Restart conversation"
                 buttonClass={ styles.restartIcon }
-                options={ ['Restart with new user ID', 'Restart with same user ID'] }
+                options={ [RestartConversationOptions.NewUserId, RestartConversationOptions.SameUserId] }
                 onClick={ this.handleStartOverClick }/>
               <button 
                 className={ `${ styles.saveTranscriptIcon } ${ styles.toolbarIcon || '' }` } 
@@ -317,18 +322,18 @@ class EmulatorComponent extends React.Component<EmulatorProps, {}> {
     this.props.enablePresentationMode(enabled);
   }
 
-  private handleStartOverClick = async (option: string = 'Restart with new user ID'): Promise<void> => {
+  private handleStartOverClick = async (option: string = RestartConversationOptions.NewUserId): Promise<void> => {
     this.props.clearLog(this.props.document.documentId);
     this.props.setInspectorObjects(this.props.document.documentId, []);
     switch (option) {
-      case 'Restart with new user ID':
+      case RestartConversationOptions.NewUserId:
         const newUserId = uniqueIdv4();
         // set new user as current on emulator facilities side
         await CommandServiceImpl.remoteCall(SharedConstants.Commands.Emulator.SetCurrentUser, newUserId);
         this.props.updateChat(this.props.documentId, { userId: newUserId });
         break;
 
-      case 'Restart with same user ID':
+      case RestartConversationOptions.SameUserId:
         this.startNewConversation();
         break;
 
diff --git a/packages/app/client/src/ui/editor/emulator/toolbar/toolbar.scss b/packages/app/client/src/ui/editor/emulator/toolbar/toolbar.scss
index 44ed2a713..45f730206 100644
--- a/packages/app/client/src/ui/editor/emulator/toolbar/toolbar.scss
+++ b/packages/app/client/src/ui/editor/emulator/toolbar/toolbar.scss
@@ -36,7 +36,7 @@
   display: flex;
   flex-wrap: nowrap;
   align-items: center;
-  height: 40px;
+  height: 29px;
   padding-left: 12px;
   background-color: var(--toolbar-bg);
   border-top: var(--toolbar-border);
diff --git a/packages/sdk/ui-react/src/media/ic_chevron_up.svg b/packages/sdk/ui-react/src/media/ic_chevron_up.svg
index f678aa586..35bd3610a 100644
--- a/packages/sdk/ui-react/src/media/ic_chevron_up.svg
+++ b/packages/sdk/ui-react/src/media/ic_chevron_up.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 16.34"><title>ChevronUp</title><polygon points="28.68 16.34 15 2.67 1.32 16.34 0 15.02 15 0 30 15.02 28.68 16.34"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 16.34"><title>ChevronUp</title><polygon points="28.68 16.34 15 2.67 1.32 16.34 0 15.02 15 0 30 15.02 28.68 16.34"/></svg>
diff --git a/packages/sdk/ui-react/src/widget/splitButton/splitButtonPanel/splitButtonPanel.scss b/packages/sdk/ui-react/src/widget/splitButton/splitButtonPanel/splitButtonPanel.scss
index 6690c337d..a297f38eb 100644
--- a/packages/sdk/ui-react/src/widget/splitButton/splitButtonPanel/splitButtonPanel.scss
+++ b/packages/sdk/ui-react/src/widget/splitButton/splitButtonPanel/splitButtonPanel.scss
@@ -56,4 +56,4 @@
   &:hover, &.selected {
     background-color: var(--split-button-selected-item-bg-color);
   }
-}
\ No newline at end of file
+}