diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index eabca5b3c..a73a9223b 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -10,8 +10,7 @@ import {
   SubMenu,
 } from 'react-contextmenu';
 
-import { SessionIconButton } from '../session/icon/SessionIconButton';
-import { SessionIconSize, SessionIconType } from '../session/icon';
+import { SessionIconButton, SessionIconSize, SessionIconType } from '../session/icon';
 
 interface TimerOption {
   name: string;
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 2d6916acb..e26dea64c 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -31,8 +31,7 @@ import { getIncrement } from '../../util/timer';
 import { isFileDangerous } from '../../util/isFileDangerous';
 import { ColorType, LocalizerType } from '../../types/Util';
 import { ContextMenu, ContextMenuTrigger, MenuItem } from 'react-contextmenu';
-import { SessionIcon } from '../session/icon/SessionIcon';
-import { SessionIconSize, SessionIconType } from '../session/icon';
+import { SessionIcon, SessionIconSize, SessionIconType } from '../session/icon';
 
 declare global {
   interface Window {
diff --git a/ts/components/session/icon/SessionIcon.tsx b/ts/components/session/icon/SessionIcon.tsx
index 4cc38b243..17e569892 100644
--- a/ts/components/session/icon/SessionIcon.tsx
+++ b/ts/components/session/icon/SessionIcon.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import { icons, SessionIconSize, SessionIconType } from './Icons';
+import { icons, SessionIconSize, SessionIconType } from '../icon';
 
 export interface Props {
   iconType: SessionIconType;
diff --git a/ts/components/session/icon/SessionIconButton.tsx b/ts/components/session/icon/SessionIconButton.tsx
index e0830676d..7d92c4499 100644
--- a/ts/components/session/icon/SessionIconButton.tsx
+++ b/ts/components/session/icon/SessionIconButton.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import { Props, SessionIcon } from './SessionIcon';
+import { Props, SessionIcon } from '../icon';
 
 export class SessionIconButton extends React.PureComponent<Props> {
   public static defaultProps = SessionIcon.defaultProps;
diff --git a/ts/components/session/icon/index.tsx b/ts/components/session/icon/index.tsx
index a413d55c0..52c63a146 100644
--- a/ts/components/session/icon/index.tsx
+++ b/ts/components/session/icon/index.tsx
@@ -1 +1,3 @@
 export { icons, SessionIconSize, SessionIconType } from './Icons';
+export { SessionIcon, Props } from './SessionIcon';
+export { SessionIconButton } from './SessionIconButton';
\ No newline at end of file