diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 7c9416713..eabca5b3c 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -10,8 +10,8 @@ import {
   SubMenu,
 } from 'react-contextmenu';
 
-import { SessionIconButton } from '../session/SessionIconButton';
-import { SessionIconSize, SessionIconType } from '../session/SessionIcon';
+import { SessionIconButton } from '../session/icon/SessionIconButton';
+import { SessionIconSize, SessionIconType } from '../session/icon';
 
 interface TimerOption {
   name: string;
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 09ff44834..7b27416f5 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -31,11 +31,8 @@ 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,
-  SessionIconSize,
-  SessionIconType,
-} from '../session/SessionIcon';
+import { SessionIcon } from '../session/icon/SessionIcon';
+import { SessionIconSize, SessionIconType } from '../session/icon';
 
 declare global {
   interface Window {
diff --git a/ts/components/session/SessionIcon.tsx b/ts/components/session/icon/SessionIcon.tsx
similarity index 95%
rename from ts/components/session/SessionIcon.tsx
rename to ts/components/session/icon/SessionIcon.tsx
index 295813d7b..4cc38b243 100644
--- a/ts/components/session/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 './icon/Icons';
+import { icons, SessionIconSize, SessionIconType } from './Icons';
 
 export interface Props {
   iconType: SessionIconType;
diff --git a/ts/components/session/SessionIconButton.tsx b/ts/components/session/icon/SessionIconButton.tsx
similarity index 100%
rename from ts/components/session/SessionIconButton.tsx
rename to ts/components/session/icon/SessionIconButton.tsx
diff --git a/ts/components/session/icon/index.tsx b/ts/components/session/icon/index.tsx
new file mode 100644
index 000000000..f44da34b7
--- /dev/null
+++ b/ts/components/session/icon/index.tsx
@@ -0,0 +1,3 @@
+import { icons, SessionIconSize, SessionIconType } from './Icons';
+
+export { icons, SessionIconSize, SessionIconType };