diff --git a/.gitignore b/.gitignore
index c5585e1d744..d5510838bdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,7 +16,7 @@ npm-debug.log
yarn-error.log
# auto generated source files
-apps/webapp/src/script/components/Icon.tsx
+apps/webapp/src/script/components/icon.tsx
# yarn 2 - not using zero-installs
.pnp.*
diff --git a/.ls-lint.yml b/.ls-lint.yml
index a33402ee7dd..1250f13f6fe 100644
--- a/.ls-lint.yml
+++ b/.ls-lint.yml
@@ -24,6 +24,14 @@ ls:
apps/webapp/src/script/util/test/mock:
.ts: camelCase
.mock.ts: camelCase
+ apps/webapp/src/script/components/icon.tsx:
+ .tsx: camelCase
+ apps/webapp/src/script/page/appLock:
+ .dir: camelCase
+ .ts: camelCase
+ .tsx: camelCase
+ .test.tsx: camelCase
+ .styles.ts: camelCase
apps/webapp/src/script/page/RightSidebar/access:
.ts: camelCase
.tsx: camelCase
diff --git a/apps/webapp/.gitignore b/apps/webapp/.gitignore
index e95ccf5cdbe..6caa2ebafb1 100644
--- a/apps/webapp/.gitignore
+++ b/apps/webapp/.gitignore
@@ -25,4 +25,4 @@ yalc.lock
.yalc
# Generated files
-src/script/components/Icon.tsx
+src/script/components/icon.tsx
diff --git a/apps/webapp/bin/generate_react_icons.ts b/apps/webapp/bin/generate_react_icons.ts
index 98b4231a8bb..08563b05526 100644
--- a/apps/webapp/bin/generate_react_icons.ts
+++ b/apps/webapp/bin/generate_react_icons.ts
@@ -79,4 +79,4 @@ const dir = './src/script/components';
if (!fs.existsSync(dir)) {
fs.mkdirSync(dir, {recursive: true});
}
-fs.writeFileSync(`${dir}/Icon.tsx`, [disclaimer, iconPropsType, ...reactComponents].join('\n'));
+fs.writeFileSync(`${dir}/icon.tsx`, [disclaimer, iconPropsType, ...reactComponents].join('\n'));
diff --git a/apps/webapp/src/script/auth/component/WirelessContainer.tsx b/apps/webapp/src/script/auth/component/WirelessContainer.tsx
index 2b5e9c04eb5..b20fd67ac7d 100644
--- a/apps/webapp/src/script/auth/component/WirelessContainer.tsx
+++ b/apps/webapp/src/script/auth/component/WirelessContainer.tsx
@@ -23,7 +23,7 @@ import {FormattedMessage} from 'react-intl';
import {CloseIcon, Content, Footer, Header, Link, Small} from '@wireapp/react-ui-kit';
-import {LogoFullIcon} from 'Components/Icon';
+import {LogoFullIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {Config} from '../../Config';
diff --git a/apps/webapp/src/script/auth/page/CustomBackend.tsx b/apps/webapp/src/script/auth/page/CustomBackend.tsx
index 15e48bc8b45..b2c5bb5e5a7 100644
--- a/apps/webapp/src/script/auth/page/CustomBackend.tsx
+++ b/apps/webapp/src/script/auth/page/CustomBackend.tsx
@@ -23,7 +23,7 @@ import {useNavigate} from 'react-router-dom';
import {Button, ButtonVariant, Container, Text} from '@wireapp/react-ui-kit';
-import {LogoFullIcon} from 'Components/Icon';
+import {LogoFullIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {buttonContainerCss, containerCss, headerCss, logoCss, paragraphCss} from './CustomBackend.styles';
diff --git a/apps/webapp/src/script/auth/page/CustomEnvironmentRedirect.tsx b/apps/webapp/src/script/auth/page/CustomEnvironmentRedirect.tsx
index 6b37d8a6ab1..812da4e373e 100644
--- a/apps/webapp/src/script/auth/page/CustomEnvironmentRedirect.tsx
+++ b/apps/webapp/src/script/auth/page/CustomEnvironmentRedirect.tsx
@@ -25,7 +25,7 @@ import {connect} from 'react-redux';
import {Runtime, UrlUtil} from '@wireapp/commons';
import {COLOR, ContainerXS, FlexBox, Text} from '@wireapp/react-ui-kit';
-import {LogoIcon} from 'Components/Icon';
+import {LogoIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {afterRender} from 'Util/util';
diff --git a/apps/webapp/src/script/auth/page/Index.tsx b/apps/webapp/src/script/auth/page/Index.tsx
index 6afd799bf80..fe60f5e268f 100644
--- a/apps/webapp/src/script/auth/page/Index.tsx
+++ b/apps/webapp/src/script/auth/page/Index.tsx
@@ -29,7 +29,7 @@ import {container} from 'tsyringe';
import {UrlUtil} from '@wireapp/commons';
import {Button, ButtonVariant, ContainerXS, ErrorMessage, Text} from '@wireapp/react-ui-kit';
-import {LogoFullIcon} from 'Components/Icon';
+import {LogoFullIcon} from 'Components/icon';
import {useSingleInstance} from 'Hooks/useSingleInstance';
import {Core} from 'src/script/service/coreSingleton';
import {isDataDogEnabled} from 'Util/dataDog';
diff --git a/apps/webapp/src/script/auth/page/OAuthPermissions.tsx b/apps/webapp/src/script/auth/page/OAuthPermissions.tsx
index 44ab13af2cd..5cda835f821 100644
--- a/apps/webapp/src/script/auth/page/OAuthPermissions.tsx
+++ b/apps/webapp/src/script/auth/page/OAuthPermissions.tsx
@@ -40,7 +40,7 @@ import {
useMatchMedia,
} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {AssetRemoteData} from 'Repositories/assets/assetRemoteData';
import {AssetRepository} from 'Repositories/assets/assetRepository';
import {handleEscDown, handleKeyDown, KEY} from 'Util/keyboardUtil';
diff --git a/apps/webapp/src/script/auth/page/login/login.tsx b/apps/webapp/src/script/auth/page/login/login.tsx
index 40b8aabafd3..5b51e59c788 100644
--- a/apps/webapp/src/script/auth/page/login/login.tsx
+++ b/apps/webapp/src/script/auth/page/login/login.tsx
@@ -54,7 +54,7 @@ import {
useMatchMedia,
} from '@wireapp/react-ui-kit';
-import {LogoFullIcon} from 'Components/Icon';
+import {LogoFullIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {getLogger} from 'Util/logger';
import {isBackendError} from 'Util/typePredicateUtil';
diff --git a/apps/webapp/src/script/auth/page/login/singleSignOn.tsx b/apps/webapp/src/script/auth/page/login/singleSignOn.tsx
index b9cfe51eeb9..813910c60a0 100644
--- a/apps/webapp/src/script/auth/page/login/singleSignOn.tsx
+++ b/apps/webapp/src/script/auth/page/login/singleSignOn.tsx
@@ -46,7 +46,7 @@ import {
} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import {LogoFullIcon} from 'Components/Icon';
+import {LogoFullIcon} from 'Components/icon';
import {calculateChildWindowPosition} from 'Util/DOM/caculateChildWindowPosition';
import {t} from 'Util/localizerUtil';
import {getLogger} from 'Util/logger';
diff --git a/apps/webapp/src/script/components/AppNotification/AppNotification.tsx b/apps/webapp/src/script/components/AppNotification/AppNotification.tsx
index 8de9d79f47e..3314aaa67e0 100644
--- a/apps/webapp/src/script/components/AppNotification/AppNotification.tsx
+++ b/apps/webapp/src/script/components/AppNotification/AppNotification.tsx
@@ -23,7 +23,7 @@ import is from '@sindresorhus/is';
import {createRoot, Root} from 'react-dom/client';
import {toast, Toaster} from 'sonner';
-import {CloseIcon} from 'Components/Icon';
+import {CloseIcon} from 'Components/icon';
interface AppNotificationOptions {
message?: string;
diff --git a/apps/webapp/src/script/components/AvailabilityIcon/Availability.tsx b/apps/webapp/src/script/components/AvailabilityIcon/Availability.tsx
index 8d8b761e593..b710278bd3f 100644
--- a/apps/webapp/src/script/components/AvailabilityIcon/Availability.tsx
+++ b/apps/webapp/src/script/components/AvailabilityIcon/Availability.tsx
@@ -25,7 +25,7 @@ import {AVATAR_SIZE} from 'Components/Avatar';
import * as styles from './Availability.styles';
-import * as Icon from '../Icon';
+import * as Icon from '../icon';
const availabilityIconBaseProps = {
'data-uie-name': 'status-availability-icon',
diff --git a/apps/webapp/src/script/components/Avatar/ServiceAvatar.tsx b/apps/webapp/src/script/components/Avatar/ServiceAvatar.tsx
index e1907af240a..400537b3b89 100644
--- a/apps/webapp/src/script/components/Avatar/ServiceAvatar.tsx
+++ b/apps/webapp/src/script/components/Avatar/ServiceAvatar.tsx
@@ -21,7 +21,7 @@ import React from 'react';
import ko from 'knockout';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
import {CSS_FILL_PARENT} from 'Util/cssMixin';
diff --git a/apps/webapp/src/script/components/Badge/components/UserStatusBadges/UserStatusBadges.tsx b/apps/webapp/src/script/components/Badge/components/UserStatusBadges/UserStatusBadges.tsx
index 9f7b84a2b94..6f0bbfd0edb 100644
--- a/apps/webapp/src/script/components/Badge/components/UserStatusBadges/UserStatusBadges.tsx
+++ b/apps/webapp/src/script/components/Badge/components/UserStatusBadges/UserStatusBadges.tsx
@@ -21,7 +21,7 @@ import {Fragment} from 'react';
import {Tooltip} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {badgesWrapper, icon} from './UserStatusBadges.styles';
diff --git a/apps/webapp/src/script/components/Cells/ShareModal/CellsShareModalContent.tsx b/apps/webapp/src/script/components/Cells/ShareModal/CellsShareModalContent.tsx
index 8e941ff6244..8d8bba81f62 100644
--- a/apps/webapp/src/script/components/Cells/ShareModal/CellsShareModalContent.tsx
+++ b/apps/webapp/src/script/components/Cells/ShareModal/CellsShareModalContent.tsx
@@ -40,7 +40,7 @@ import {
} from 'Components/Cells/ShareModal/CellsShareExpirationFields';
import {CellsTableLoader} from 'Components/Conversation/ConversationCells/common/CellsTableLoader/CellsTableLoader';
import {CopyToClipboardButton} from 'Components/CopyToClipboardButton/CopyToClipboardButton';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {PasswordGeneratorButton} from 'Components/PasswordGeneratorButton';
import {Config} from 'src/script/Config';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/CellsGlobalView/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx b/apps/webapp/src/script/components/CellsGlobalView/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx
index d053906a1e4..1c00b44e61b 100644
--- a/apps/webapp/src/script/components/CellsGlobalView/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx
+++ b/apps/webapp/src/script/components/CellsGlobalView/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx
@@ -17,7 +17,7 @@
*
*/
-import {LinkIcon} from 'Components/Icon';
+import {LinkIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {wrapperStyles, iconWrapperStyles, textStyles, wrapperStylesHidden} from './CellsTableSharedColumn.styles';
diff --git a/apps/webapp/src/script/components/ClassifiedBar/ClassifiedBar.tsx b/apps/webapp/src/script/components/ClassifiedBar/ClassifiedBar.tsx
index 22166fe32da..0266ec2e326 100644
--- a/apps/webapp/src/script/components/ClassifiedBar/ClassifiedBar.tsx
+++ b/apps/webapp/src/script/components/ClassifiedBar/ClassifiedBar.tsx
@@ -20,7 +20,7 @@
import {CSSObject} from '@emotion/react';
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Conversation} from 'Repositories/entity/Conversation';
import {User} from 'Repositories/entity/User';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/components/Conversation/ConversationCells/CellsPagination/CellsPagination.tsx b/apps/webapp/src/script/components/Conversation/ConversationCells/CellsPagination/CellsPagination.tsx
index dada953f934..bba6db32bfb 100644
--- a/apps/webapp/src/script/components/Conversation/ConversationCells/CellsPagination/CellsPagination.tsx
+++ b/apps/webapp/src/script/components/Conversation/ConversationCells/CellsPagination/CellsPagination.tsx
@@ -21,7 +21,7 @@ import {useCallback} from 'react';
import {FlexBox, IconButton} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {CellsPageList} from './CellsPageList/CellsPageList';
diff --git a/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableRowOptions/CellsMoveNodeModal/CellsFoldersListModalContent/CellsFolderList/CellsFolderList.tsx b/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableRowOptions/CellsMoveNodeModal/CellsFoldersListModalContent/CellsFolderList/CellsFolderList.tsx
index 7cbd086202a..8d0ec86ce40 100644
--- a/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableRowOptions/CellsMoveNodeModal/CellsFoldersListModalContent/CellsFolderList/CellsFolderList.tsx
+++ b/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableRowOptions/CellsMoveNodeModal/CellsFoldersListModalContent/CellsFolderList/CellsFolderList.tsx
@@ -19,7 +19,7 @@
import {FolderIcon} from '@wireapp/react-ui-kit';
-import {ChevronRight} from 'Components/Icon';
+import {ChevronRight} from 'Components/icon';
import {
arrowIconStyles,
diff --git a/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx b/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx
index 9c1835d6ff5..217364fc634 100644
--- a/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx
+++ b/apps/webapp/src/script/components/Conversation/ConversationCells/CellsTable/CellsTableColumns/CellsTableSharedColumn/CellsTableSharedColumn.tsx
@@ -17,7 +17,7 @@
*
*/
-import {LinkIcon} from 'Components/Icon';
+import {LinkIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/Conversation/ReadOnlyConversationMessage/ReadOnlyConversationMessage.tsx b/apps/webapp/src/script/components/Conversation/ReadOnlyConversationMessage/ReadOnlyConversationMessage.tsx
index 8dbf1982ce6..1a1a7ee9f40 100644
--- a/apps/webapp/src/script/components/Conversation/ReadOnlyConversationMessage/ReadOnlyConversationMessage.tsx
+++ b/apps/webapp/src/script/components/Conversation/ReadOnlyConversationMessage/ReadOnlyConversationMessage.tsx
@@ -24,7 +24,7 @@ import ko from 'knockout';
import {Link, LinkVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {CONVERSATION_READONLY_STATE} from 'Repositories/conversation/ConversationRepository';
import {Conversation} from 'Repositories/entity/Conversation';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/components/ConversationListCell/components/CellDescription/CellDescription.tsx b/apps/webapp/src/script/components/ConversationListCell/components/CellDescription/CellDescription.tsx
index 219786bf993..313e44cfafc 100644
--- a/apps/webapp/src/script/components/ConversationListCell/components/CellDescription/CellDescription.tsx
+++ b/apps/webapp/src/script/components/ConversationListCell/components/CellDescription/CellDescription.tsx
@@ -21,7 +21,7 @@ import {useMemo} from 'react';
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {DraftState, generateConversationInputStorageKey} from 'Components/InputBar/common/draftState/draftState';
import {useLocalStorage} from 'Hooks/useLocalStorage';
import {generateCellState} from 'Repositories/conversation/ConversationCellState';
diff --git a/apps/webapp/src/script/components/ConversationListCell/components/StatusIcon/StatusIcon.tsx b/apps/webapp/src/script/components/ConversationListCell/components/StatusIcon/StatusIcon.tsx
index 73980524e51..5d5d418a8a9 100644
--- a/apps/webapp/src/script/components/ConversationListCell/components/StatusIcon/StatusIcon.tsx
+++ b/apps/webapp/src/script/components/ConversationListCell/components/StatusIcon/StatusIcon.tsx
@@ -19,7 +19,7 @@
import {useMemo} from 'react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {generateCellState} from 'Repositories/conversation/ConversationCellState';
import {ConversationStatusIcon} from 'Repositories/conversation/ConversationStatusIcon';
import type {Conversation} from 'Repositories/entity/Conversation';
diff --git a/apps/webapp/src/script/components/CopyToClipboardButton/CopyToClipboardButton.tsx b/apps/webapp/src/script/components/CopyToClipboardButton/CopyToClipboardButton.tsx
index 040421fe53a..e0042961e75 100644
--- a/apps/webapp/src/script/components/CopyToClipboardButton/CopyToClipboardButton.tsx
+++ b/apps/webapp/src/script/components/CopyToClipboardButton/CopyToClipboardButton.tsx
@@ -21,7 +21,7 @@ import {useState} from 'react';
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {copyText} from 'Util/clipboardUtil';
interface CopyToClipboardButtonProps {
diff --git a/apps/webapp/src/script/components/FileFullscreenModal/FileHeader/FileHeader.tsx b/apps/webapp/src/script/components/FileFullscreenModal/FileHeader/FileHeader.tsx
index 7ab584007ff..52d95f1f1f0 100644
--- a/apps/webapp/src/script/components/FileFullscreenModal/FileHeader/FileHeader.tsx
+++ b/apps/webapp/src/script/components/FileFullscreenModal/FileHeader/FileHeader.tsx
@@ -32,7 +32,7 @@ import {
import {FileTypeIcon} from 'Components/Conversation/common/FileTypeIcon/FileTypeIcon';
import {isInRecycleBin} from 'Components/Conversation/ConversationCells/common/recycleBin/recycleBin';
-import {EditIcon} from 'Components/Icon';
+import {EditIcon} from 'Components/icon';
import {iconStyles} from 'Components/MessagesList/Message/ContentMessage/asset/MultipartAssets/FileAssetCard/common/FileAssetOptions/FileAssetOptions.styles';
import {MessageTime} from 'Components/MessagesList/Message/MessageTime';
import {useFileHistoryModal} from 'Components/Modals/FileHistoryModal/hooks/useFileHistoryModal';
diff --git a/apps/webapp/src/script/components/FileFullscreenModal/PdfViewer/PdfControls/PdfControls.tsx b/apps/webapp/src/script/components/FileFullscreenModal/PdfViewer/PdfControls/PdfControls.tsx
index 34e926390a2..6ac07f02d81 100644
--- a/apps/webapp/src/script/components/FileFullscreenModal/PdfViewer/PdfControls/PdfControls.tsx
+++ b/apps/webapp/src/script/components/FileFullscreenModal/PdfViewer/PdfControls/PdfControls.tsx
@@ -26,7 +26,7 @@ import {
SidebarInactiveIcon,
} from '@wireapp/react-ui-kit';
-import {ZoomInIcon, ZoomOutIcon} from 'Components/Icon';
+import {ZoomInIcon, ZoomOutIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {buttonStyles, pageNumberStyles, wrapperStyles} from './PdfControls.styles';
diff --git a/apps/webapp/src/script/components/Giphy/Giphy.tsx b/apps/webapp/src/script/components/Giphy/Giphy.tsx
index 8a60f4f7603..c307aec7c96 100644
--- a/apps/webapp/src/script/components/Giphy/Giphy.tsx
+++ b/apps/webapp/src/script/components/Giphy/Giphy.tsx
@@ -26,7 +26,7 @@ import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
import {GifImage} from 'Components/Giphy/GifImage';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Gif, GiphyRepository} from 'Repositories/extension/GiphyRepository';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/HistoryImport/HistoryImport.tsx b/apps/webapp/src/script/components/HistoryImport/HistoryImport.tsx
index 5583949b6b2..d13b90a8ec5 100644
--- a/apps/webapp/src/script/components/HistoryImport/HistoryImport.tsx
+++ b/apps/webapp/src/script/components/HistoryImport/HistoryImport.tsx
@@ -21,7 +21,7 @@ import {useEffect, useState} from 'react';
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {PrimaryModal} from 'Components/Modals/PrimaryModal';
import {ProgressBar} from 'Components/ProgressBar/ProgressBar';
import {BackupRepository} from 'Repositories/backup/backupRepository';
diff --git a/apps/webapp/src/script/components/Image/RestrictedImage.tsx b/apps/webapp/src/script/components/Image/RestrictedImage.tsx
index 294660fab12..c723b2a1d10 100644
--- a/apps/webapp/src/script/components/Image/RestrictedImage.tsx
+++ b/apps/webapp/src/script/components/Image/RestrictedImage.tsx
@@ -19,7 +19,7 @@
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface RestrictedImageProps {
diff --git a/apps/webapp/src/script/components/InputBar/FilePreviews/common/FilePreviewDeleteButton/FilePreviewDeleteButton.tsx b/apps/webapp/src/script/components/InputBar/FilePreviews/common/FilePreviewDeleteButton/FilePreviewDeleteButton.tsx
index 22a1f23c046..005a896008c 100644
--- a/apps/webapp/src/script/components/InputBar/FilePreviews/common/FilePreviewDeleteButton/FilePreviewDeleteButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/FilePreviews/common/FilePreviewDeleteButton/FilePreviewDeleteButton.tsx
@@ -17,7 +17,7 @@
*
*/
-import {CloseIcon} from 'Components/Icon';
+import {CloseIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {buttonStyles, iconStyles} from './FilePreviewDeleteButton.styles';
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/AssetUploadButton/AssetUploadButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/AssetUploadButton/AssetUploadButton.tsx
index da670776763..be4f8f05a1c 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/AssetUploadButton/AssetUploadButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/AssetUploadButton/AssetUploadButton.tsx
@@ -21,7 +21,7 @@ import {useRef} from 'react';
import {TabIndex} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface AssetUploadButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/CancelEditButton/CancelEditButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/CancelEditButton/CancelEditButton.tsx
index 189c1e436a4..0c8a53b97a0 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/CancelEditButton/CancelEditButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/CancelEditButton/CancelEditButton.tsx
@@ -19,7 +19,7 @@
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface CancelEditButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/CellAssetUploadButton/CellAssetUploadButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/CellAssetUploadButton/CellAssetUploadButton.tsx
index 1d6b3c2d375..a307a26d7c6 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/CellAssetUploadButton/CellAssetUploadButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/CellAssetUploadButton/CellAssetUploadButton.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface CellAssetUploadButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/CellImageUploadButton/CellImageUploadButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/CellImageUploadButton/CellImageUploadButton.tsx
index 39bc414df02..61a444e6c87 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/CellImageUploadButton/CellImageUploadButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/CellImageUploadButton/CellImageUploadButton.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface CellImageUploadButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/FormatTextButton/FormatTextButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/FormatTextButton/FormatTextButton.tsx
index fafb1b0e14e..ccefa3cfce7 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/FormatTextButton/FormatTextButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/FormatTextButton/FormatTextButton.tsx
@@ -21,7 +21,7 @@ import type {MouseEvent} from 'react';
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface FormatTextButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/GiphyButton/GiphyButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/GiphyButton/GiphyButton.tsx
index 9a6297e1ec9..afb44e41ecc 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/GiphyButton/GiphyButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/GiphyButton/GiphyButton.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface GiphyButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/ImageUploadButton/ImageUploadButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/ImageUploadButton/ImageUploadButton.tsx
index 39d397b43a7..48f0ccde56f 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/ImageUploadButton/ImageUploadButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/ImageUploadButton/ImageUploadButton.tsx
@@ -21,7 +21,7 @@ import {useRef} from 'react';
import {TabIndex} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface ImageUploadButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx
index 812ebbf9a12..b320de2bcee 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/MessageTimerButton/MessageTimerButton.tsx
@@ -22,7 +22,7 @@ import {MouseEvent, KeyboardEvent} from 'react';
import cx from 'classnames';
import {container} from 'tsyringe';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Conversation} from 'Repositories/entity/Conversation';
import {TeamState} from 'Repositories/team/TeamState';
import {EphemeralTimings} from 'src/script/ephemeral/EphemeralTimings';
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/PingButton/PingButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/PingButton/PingButton.tsx
index 55824e89f6b..aaa73e3b4d0 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/PingButton/PingButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/PingButton/PingButton.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface PingButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarControls/SendMessageButton/SendMessageButton.tsx b/apps/webapp/src/script/components/InputBar/InputBarControls/SendMessageButton/SendMessageButton.tsx
index 28fe556ee09..464160ba6d4 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarControls/SendMessageButton/SendMessageButton.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarControls/SendMessageButton/SendMessageButton.tsx
@@ -19,7 +19,7 @@
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface SendMessageButtonProps {
diff --git a/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/FormatToolbar/LinkDialog/LinkDialog.tsx b/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/FormatToolbar/LinkDialog/LinkDialog.tsx
index bf499f31602..b38b796b1f8 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/FormatToolbar/LinkDialog/LinkDialog.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/FormatToolbar/LinkDialog/LinkDialog.tsx
@@ -23,7 +23,7 @@ import is from '@sindresorhus/is';
import {Input, ErrorMessage, Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/plugins/MentionsPlugin/MentionSuggestionsItem.tsx b/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/plugins/MentionsPlugin/MentionSuggestionsItem.tsx
index 77d566d04f2..9bedff759eb 100644
--- a/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/plugins/MentionsPlugin/MentionSuggestionsItem.tsx
+++ b/apps/webapp/src/script/components/InputBar/InputBarEditor/RichTextEditor/plugins/MentionsPlugin/MentionSuggestionsItem.tsx
@@ -24,7 +24,7 @@ import cx from 'classnames';
import {TabIndex} from '@wireapp/react-ui-kit';
import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {User} from 'Repositories/entity/User';
import {useKoSubscribableChildren} from 'Util/componentUtil';
import {handleKeyDown, KEY} from 'Util/keyboardUtil';
diff --git a/apps/webapp/src/script/components/InputBar/PastedFileControls/PastedFileControls.tsx b/apps/webapp/src/script/components/InputBar/PastedFileControls/PastedFileControls.tsx
index e50201c5904..c147550deff 100644
--- a/apps/webapp/src/script/components/InputBar/PastedFileControls/PastedFileControls.tsx
+++ b/apps/webapp/src/script/components/InputBar/PastedFileControls/PastedFileControls.tsx
@@ -21,7 +21,7 @@ import {FC} from 'react';
import {TabIndex} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {Config} from '../../../Config';
diff --git a/apps/webapp/src/script/components/InputBar/ReplyBar/ReplyBar.tsx b/apps/webapp/src/script/components/InputBar/ReplyBar/ReplyBar.tsx
index f8aa501a3f1..b9d85f0a0d5 100644
--- a/apps/webapp/src/script/components/InputBar/ReplyBar/ReplyBar.tsx
+++ b/apps/webapp/src/script/components/InputBar/ReplyBar/ReplyBar.tsx
@@ -21,7 +21,7 @@ import {TabIndex} from '@wireapp/react-ui-kit';
import {RestrictedVideo} from 'Components/asset/RestrictedVideo';
import {ParticipantMicOnIcon} from 'Components/calling/ParticipantMicOnIcon';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {AssetImage} from 'Components/Image';
import {MultipartAssetPreview} from 'Components/MessagesList/Message/ContentMessage/asset/MultipartAssetPreview';
import {ContentMessage} from 'Repositories/entity/message/ContentMessage';
diff --git a/apps/webapp/src/script/components/InputBar/TypingIndicator/TypingIndicator.tsx b/apps/webapp/src/script/components/InputBar/TypingIndicator/TypingIndicator.tsx
index ffe959d7e38..0c21c9955bd 100644
--- a/apps/webapp/src/script/components/InputBar/TypingIndicator/TypingIndicator.tsx
+++ b/apps/webapp/src/script/components/InputBar/TypingIndicator/TypingIndicator.tsx
@@ -18,7 +18,7 @@
*/
import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/LegalHoldDot/LegalHoldDot.tsx b/apps/webapp/src/script/components/LegalHoldDot/LegalHoldDot.tsx
index 12b74844147..7b3e03d1fc4 100644
--- a/apps/webapp/src/script/components/LegalHoldDot/LegalHoldDot.tsx
+++ b/apps/webapp/src/script/components/LegalHoldDot/LegalHoldDot.tsx
@@ -21,7 +21,7 @@ import React from 'react';
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useLegalHoldModalState} from 'Components/Modals/LegalHoldModal/LegalHoldModal.state';
import type {Conversation} from 'Repositories/entity/Conversation';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/CallMessage.test.tsx b/apps/webapp/src/script/components/MessagesList/Message/CallMessage.test.tsx
index 80f39f2e921..f8ce8388132 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/CallMessage.test.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/CallMessage.test.tsx
@@ -24,7 +24,7 @@ import {CallMessage as CallMessageEntity} from 'Repositories/entity/message/Call
import {CallMessage} from './CallMessage';
-jest.mock('Components/Icon', () => ({
+jest.mock('Components/icon', () => ({
HangupIcon: () => {
return hangupIcon;
},
diff --git a/apps/webapp/src/script/components/MessagesList/Message/CallMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/CallMessage.tsx
index 55e665437ad..e42af1af539 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/CallMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/CallMessage.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {CallMessage as CallMessageEntity} from 'Repositories/entity/message/CallMessage';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/CallTimeoutMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/CallTimeoutMessage.tsx
index b74798e4e94..2e42253c36a 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/CallTimeoutMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/CallTimeoutMessage.tsx
@@ -19,7 +19,7 @@
import {REASON} from '@wireapp/avs';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {CallingTimeoutMessage} from 'Repositories/entity/message/CallingTimeoutMessage';
import {useKoSubscribableChildren} from 'Util/componentUtil';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton.tsx
index fe12cc3d1ea..d1bede3e23e 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton.tsx
@@ -19,7 +19,7 @@
import {FC} from 'react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {getActionsMenuCSS, getIconCSS, messageActionsMenuButton} from './MessageActions.styles';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx
index 88c66ddab86..ea1851df030 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx
@@ -21,7 +21,7 @@ import {Tooltip} from '@wireapp/react-ui-kit';
import {AVATAR_SIZE, Avatar} from 'Components/Avatar';
import {UserBlockedBadge} from 'Components/Badge';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {UserName} from 'Components/UserName';
import {ContentMessage} from 'Repositories/entity/message/ContentMessage';
import {DeleteMessage} from 'Repositories/entity/message/DeleteMessage';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx
index 463d11e7373..744dbfa2b9e 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx
@@ -25,7 +25,7 @@ import cx from 'classnames';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {AssetImage} from 'Components/Image';
import type {Conversation} from 'Repositories/entity/Conversation';
import {ContentMessage} from 'Repositories/entity/message/ContentMessage';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/AudioAsset.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/AudioAsset.tsx
index abc34f1a266..5c4ea75d9b2 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/AudioAsset.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/AudioAsset.tsx
@@ -22,7 +22,7 @@ import {useEffect, useState} from 'react';
import cx from 'classnames';
import {container} from 'tsyringe';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {AssetTransferState} from 'Repositories/assets/assetTransferState';
import type {ContentMessage} from 'Repositories/entity/message/ContentMessage';
import type {FileAsset} from 'Repositories/entity/message/FileAsset';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/RestrictedAudio/RestrictedAudio.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/RestrictedAudio/RestrictedAudio.tsx
index a1fc4e5e16d..d1ff527a5b0 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/RestrictedAudio/RestrictedAudio.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/AudioAsset/RestrictedAudio/RestrictedAudio.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
const RestrictedAudio = () => {
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset/ImageAsset.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset/ImageAsset.tsx
index 4977ed46e43..0db68e6ff32 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset/ImageAsset.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset/ImageAsset.tsx
@@ -21,7 +21,7 @@ import React from 'react';
import {CSSObject} from '@emotion/react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {AssetImage} from 'Components/Image';
import {ContentMessage} from 'Repositories/entity/message/ContentMessage';
import {MediumImage} from 'Repositories/entity/message/MediumImage';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/TextMessageRenderer/ShowMoreButton.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/TextMessageRenderer/ShowMoreButton.tsx
index 3328b7132c4..a866c85dccf 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/TextMessageRenderer/ShowMoreButton.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/TextMessageRenderer/ShowMoreButton.tsx
@@ -21,7 +21,7 @@ import {FC, HTMLProps} from 'react';
import cx from 'classnames';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useMessageFocusedTabIndex} from 'Components/MessagesList/Message/util';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/common/AssetLoader/AssetLoader.tsx b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/common/AssetLoader/AssetLoader.tsx
index 9fad1d947b3..c7b121ec3d2 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/common/AssetLoader/AssetLoader.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ContentMessage/asset/common/AssetLoader/AssetLoader.tsx
@@ -21,7 +21,7 @@ import React from 'react';
import {TabIndex} from '@wireapp/react-ui-kit';
-import {CloseIcon} from 'Components/Icon';
+import {CloseIcon} from 'Components/icon';
import {handleKeyDown, KEY} from 'Util/keyboardUtil';
interface AssetLoaderProps {
diff --git a/apps/webapp/src/script/components/MessagesList/Message/DecryptErrorMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/DecryptErrorMessage.tsx
index ef065ac7ffb..88f7b49fb16 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/DecryptErrorMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/DecryptErrorMessage.tsx
@@ -19,7 +19,7 @@
import {useState} from 'react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {DecryptErrorMessage as DecryptErrorMessageEntity} from 'Repositories/entity/message/DecryptErrorMessage';
import {Config} from 'src/script/Config';
import {MotionDuration} from 'src/script/motion/MotionDuration';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/E2EIVerificationMessage/E2EIVerificationMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/E2EIVerificationMessage/E2EIVerificationMessage.tsx
index 0b615edf8c5..d610a46a258 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/E2EIVerificationMessage/E2EIVerificationMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/E2EIVerificationMessage/E2EIVerificationMessage.tsx
@@ -19,7 +19,7 @@
import {Link, LinkVariant, MLSVerified} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Conversation} from 'Repositories/entity/Conversation';
import {E2EIVerificationMessage as E2EIVerificationMessageEntity} from 'Repositories/entity/message/E2EIVerificationMessage';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx
index e3443a8e40a..033ff655867 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx
@@ -24,7 +24,7 @@ import {container} from 'tsyringe';
import {Button, ButtonVariant, Link, LinkVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {getUserName} from 'Components/UserName';
import {FailedToAddUsersMessage as FailedToAddUsersMessageEntity} from 'Repositories/entity/message/FailedToAddUsersMessage';
import {User} from 'Repositories/entity/User';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/FederationStopMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/FederationStopMessage.tsx
index d19df48b454..4fdd9fbb724 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/FederationStopMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/FederationStopMessage.tsx
@@ -19,7 +19,7 @@
import {Link, LinkVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {FederationStopMessage as FederationStopMessageEntity} from 'Repositories/entity/message/FederationStopMessage';
import {Config} from 'src/script/Config';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/MemberMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/MemberMessage.tsx
index b84ed1cd516..27d9f57d12c 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/MemberMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/MemberMessage.tsx
@@ -19,7 +19,7 @@
import {Button, ButtonVariant, CollectionIcon} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {MemberMessage as MemberMessageEntity} from 'Repositories/entity/message/MemberMessage';
import {User} from 'Repositories/entity/User';
import {SystemMessageType} from 'src/script/message/SystemMessageType';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ProtocolUpdateMessage/ProtocolUpdateMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/ProtocolUpdateMessage/ProtocolUpdateMessage.tsx
index 8ed34e7dcf2..ea88416c8ad 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ProtocolUpdateMessage/ProtocolUpdateMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ProtocolUpdateMessage/ProtocolUpdateMessage.tsx
@@ -19,7 +19,7 @@
import {CONVERSATION_PROTOCOL} from '@wireapp/api-client/lib/team';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ProtocolUpdateMessage as ProtocolUpdateMessageEntity} from 'Repositories/entity/message/ProtocolUpdateMessage';
import {SystemMessage} from 'Repositories/entity/message/SystemMessage';
import {Config} from 'src/script/Config';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ReadIndicator/ReadIndicator.tsx b/apps/webapp/src/script/components/MessagesList/Message/ReadIndicator/ReadIndicator.tsx
index fd517dbcc09..ef57eb51032 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ReadIndicator/ReadIndicator.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ReadIndicator/ReadIndicator.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Message} from 'Repositories/entity/message/Message';
import {useKoSubscribableChildren} from 'Util/componentUtil';
import {formatTimeShort} from 'Util/timeUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx b/apps/webapp/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx
index c5c1ea78b2d..2375f25f671 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx
@@ -21,7 +21,7 @@ import {useEffect, useState} from 'react';
import cx from 'classnames';
-import {ReadIcon} from 'Components/Icon';
+import {ReadIcon} from 'Components/icon';
import {Message} from 'Repositories/entity/message/Message';
import {useKoSubscribableChildren} from 'Util/componentUtil';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.test.tsx b/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.test.tsx
index e227022127c..557556b52ef 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.test.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.test.tsx
@@ -25,7 +25,7 @@ import {RenameMessage} from 'Repositories/entity/message/RenameMessage';
import {SystemMessage} from './SystemMessage';
-jest.mock('Components/Icon', () => ({
+jest.mock('Components/icon', () => ({
EditIcon: () => {
return ;
},
diff --git a/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx b/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx
index b151446b080..4111f3b7513 100644
--- a/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx
+++ b/apps/webapp/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx
@@ -19,7 +19,7 @@
import {MLSVerified} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {E2EIVerificationMessage} from 'Repositories/entity/message/E2EIVerificationMessage';
import {JoinedAfterMLSMigrationFinalisationMessage} from 'Repositories/entity/message/JoinedAfterMLSMigrationFinalisationMessage';
import {MessageTimerUpdateMessage} from 'Repositories/entity/message/MessageTimerUpdateMessage';
diff --git a/apps/webapp/src/script/components/Modals/CreateConversation/ConversationType/ConversationFeature.tsx b/apps/webapp/src/script/components/Modals/CreateConversation/ConversationType/ConversationFeature.tsx
index 665d1817729..397aeea7500 100644
--- a/apps/webapp/src/script/components/Modals/CreateConversation/ConversationType/ConversationFeature.tsx
+++ b/apps/webapp/src/script/components/Modals/CreateConversation/ConversationType/ConversationFeature.tsx
@@ -19,7 +19,7 @@
import {ShieldIcon} from '@wireapp/react-ui-kit';
-import {CheckIcon} from 'Components/Icon';
+import {CheckIcon} from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/Modals/CreateConversation/CreateConversationHeader.tsx b/apps/webapp/src/script/components/Modals/CreateConversation/CreateConversationHeader.tsx
index 094e3a90eed..b431d57ecb3 100644
--- a/apps/webapp/src/script/components/Modals/CreateConversation/CreateConversationHeader.tsx
+++ b/apps/webapp/src/script/components/Modals/CreateConversation/CreateConversationHeader.tsx
@@ -21,7 +21,7 @@ import {container} from 'tsyringe';
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {UserState} from 'Repositories/user/userState';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/Modals/DetailViewModal/DetailViewModalHeader.tsx b/apps/webapp/src/script/components/Modals/DetailViewModal/DetailViewModalHeader.tsx
index 481fba0e895..35bfb83a7e1 100644
--- a/apps/webapp/src/script/components/Modals/DetailViewModal/DetailViewModalHeader.tsx
+++ b/apps/webapp/src/script/components/Modals/DetailViewModal/DetailViewModalHeader.tsx
@@ -19,7 +19,7 @@
import {FC} from 'react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ContentMessage} from 'Repositories/entity/message/ContentMessage';
import {useKoSubscribableChildren} from 'Util/componentUtil';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/Modals/FileHistoryModal/FileHistoryHeader.tsx b/apps/webapp/src/script/components/Modals/FileHistoryModal/FileHistoryHeader.tsx
index 37d2469e5cc..15c571735f8 100644
--- a/apps/webapp/src/script/components/Modals/FileHistoryModal/FileHistoryHeader.tsx
+++ b/apps/webapp/src/script/components/Modals/FileHistoryModal/FileHistoryHeader.tsx
@@ -19,7 +19,7 @@
import {FileTypeIcon} from 'Components/Conversation/common/FileTypeIcon/FileTypeIcon';
import {FileLoader} from 'Components/FileFullscreenModal/FileLoader/FileLoader';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx b/apps/webapp/src/script/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx
index 16fadc4fcc6..32f0ad7e227 100644
--- a/apps/webapp/src/script/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx
+++ b/apps/webapp/src/script/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx
@@ -19,7 +19,7 @@
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx b/apps/webapp/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx
index 0c4140df9b6..dd285975f11 100644
--- a/apps/webapp/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx
+++ b/apps/webapp/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx
@@ -31,7 +31,7 @@ import {Button, ButtonVariant, Option, Select} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {AppsDisabledNote} from 'Components/Note/AppsDisabledNote/AppsDisabledNote';
import {SearchInput} from 'Components/SearchInput';
diff --git a/apps/webapp/src/script/components/Modals/InviteModal/InviteModal.tsx b/apps/webapp/src/script/components/Modals/InviteModal/InviteModal.tsx
index 28d3b5dbec0..3b8268dcc6f 100644
--- a/apps/webapp/src/script/components/Modals/InviteModal/InviteModal.tsx
+++ b/apps/webapp/src/script/components/Modals/InviteModal/InviteModal.tsx
@@ -21,7 +21,7 @@ import React, {useState} from 'react';
import {Runtime} from '@wireapp/commons';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {User} from 'Repositories/entity/User';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx b/apps/webapp/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx
index ff837ccdd36..4e98e81b655 100644
--- a/apps/webapp/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx
+++ b/apps/webapp/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx
@@ -23,7 +23,7 @@ import {LegalHoldMemberStatus} from '@wireapp/api-client/lib/team/legalhold/';
import cx from 'classnames';
import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {LegalHoldDot} from 'Components/LegalHoldDot';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {UserDevicesState, UserDevices} from 'Components/UserDevices';
diff --git a/apps/webapp/src/script/components/Modals/ModalComponent/ModalComponent.tsx b/apps/webapp/src/script/components/Modals/ModalComponent/ModalComponent.tsx
index 83ef68c61ea..c86e355fd66 100644
--- a/apps/webapp/src/script/components/Modals/ModalComponent/ModalComponent.tsx
+++ b/apps/webapp/src/script/components/Modals/ModalComponent/ModalComponent.tsx
@@ -33,7 +33,7 @@ import {
ModalOverlayVisibleStyles,
} from './ModalComponent.styles';
-import {LoadingIcon} from '../../Icon';
+import {LoadingIcon} from '../../icon';
interface ModalComponentProps extends HTMLProps {
children: React.ReactNode;
diff --git a/apps/webapp/src/script/components/Modals/PrimaryModal/PrimaryModalHeader/PrimaryModalHeader.tsx b/apps/webapp/src/script/components/Modals/PrimaryModal/PrimaryModalHeader/PrimaryModalHeader.tsx
index 86230362aea..f5b3793e05a 100644
--- a/apps/webapp/src/script/components/Modals/PrimaryModal/PrimaryModalHeader/PrimaryModalHeader.tsx
+++ b/apps/webapp/src/script/components/Modals/PrimaryModal/PrimaryModalHeader/PrimaryModalHeader.tsx
@@ -19,7 +19,7 @@
import {forwardRef} from 'react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {removeCurrentModal} from '../PrimaryModalState';
diff --git a/apps/webapp/src/script/components/Modals/ServiceModal/ServiceModal.tsx b/apps/webapp/src/script/components/Modals/ServiceModal/ServiceModal.tsx
index 2355a2010e1..2ae3b96317b 100644
--- a/apps/webapp/src/script/components/Modals/ServiceModal/ServiceModal.tsx
+++ b/apps/webapp/src/script/components/Modals/ServiceModal/ServiceModal.tsx
@@ -18,7 +18,7 @@
*/
import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {IntegrationRepository} from 'Repositories/integration/IntegrationRepository';
import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
diff --git a/apps/webapp/src/script/components/Modals/UserModal/UserModal.tsx b/apps/webapp/src/script/components/Modals/UserModal/UserModal.tsx
index c84478ae471..717484c183f 100644
--- a/apps/webapp/src/script/components/Modals/UserModal/UserModal.tsx
+++ b/apps/webapp/src/script/components/Modals/UserModal/UserModal.tsx
@@ -26,7 +26,7 @@ import {container} from 'tsyringe';
import {TabIndex, Link, LinkVariant} from '@wireapp/react-ui-kit';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {EnrichedFields} from 'Components/panel/EnrichedFields';
import {UserActions} from 'Components/panel/UserActions';
diff --git a/apps/webapp/src/script/components/Note/Note.tsx b/apps/webapp/src/script/components/Note/Note.tsx
index 4e8c8412020..5f1ae0ff3cf 100644
--- a/apps/webapp/src/script/components/Note/Note.tsx
+++ b/apps/webapp/src/script/components/Note/Note.tsx
@@ -19,7 +19,7 @@
import {ReactNode} from 'react';
-import {InfoIcon} from 'Components/Icon';
+import {InfoIcon} from 'Components/icon';
import {ContainerStyle, ContentStyle, HeaderStyle} from './Note.styles';
diff --git a/apps/webapp/src/script/components/ParticipantItemContent/ParticipantItemContent.tsx b/apps/webapp/src/script/components/ParticipantItemContent/ParticipantItemContent.tsx
index 6fe14520ace..702edf8639e 100644
--- a/apps/webapp/src/script/components/ParticipantItemContent/ParticipantItemContent.tsx
+++ b/apps/webapp/src/script/components/ParticipantItemContent/ParticipantItemContent.tsx
@@ -22,7 +22,7 @@ import React from 'react';
import ko from 'knockout';
import {UserBlockedBadge, UserVerificationBadges} from 'Components/Badge';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {UserInfo} from 'Components/UserInfo';
import {User} from 'Repositories/entity/User';
import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
diff --git a/apps/webapp/src/script/components/PasswordGeneratorButton/PasswordGeneratorButton.tsx b/apps/webapp/src/script/components/PasswordGeneratorButton/PasswordGeneratorButton.tsx
index 22a3391dc56..79888b1d294 100644
--- a/apps/webapp/src/script/components/PasswordGeneratorButton/PasswordGeneratorButton.tsx
+++ b/apps/webapp/src/script/components/PasswordGeneratorButton/PasswordGeneratorButton.tsx
@@ -19,7 +19,7 @@
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {generateRandomPassword} from 'Util/stringUtil';
diff --git a/apps/webapp/src/script/components/SearchInput/SearchInput.tsx b/apps/webapp/src/script/components/SearchInput/SearchInput.tsx
index cd81ab45769..f338aeba4c7 100644
--- a/apps/webapp/src/script/components/SearchInput/SearchInput.tsx
+++ b/apps/webapp/src/script/components/SearchInput/SearchInput.tsx
@@ -27,7 +27,7 @@ import {MAX_HANDLE_LENGTH} from 'Repositories/user/userHandleGenerator';
import {isEnterKey} from 'Util/keyboardUtil';
import {t} from 'Util/localizerUtil';
-import * as Icon from '../Icon';
+import * as Icon from '../icon';
interface SearchInputProps {
onEnter?: (event: React.KeyboardEvent) => void | Promise;
diff --git a/apps/webapp/src/script/components/TextInput/TextInput.tsx b/apps/webapp/src/script/components/TextInput/TextInput.tsx
index 922a4ed0c31..0b8339ddd68 100644
--- a/apps/webapp/src/script/components/TextInput/TextInput.tsx
+++ b/apps/webapp/src/script/components/TextInput/TextInput.tsx
@@ -23,7 +23,7 @@ import is from '@sindresorhus/is';
import {CheckIcon, COLOR} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {isTabKey} from 'Util/keyboardUtil';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/TitleBar/TitleBar.tsx b/apps/webapp/src/script/components/TitleBar/TitleBar.tsx
index bea7ad0c5c8..273a665b8d7 100644
--- a/apps/webapp/src/script/components/TitleBar/TitleBar.tsx
+++ b/apps/webapp/src/script/components/TitleBar/TitleBar.tsx
@@ -28,7 +28,7 @@ import {WebAppEvents} from '@wireapp/webapp-events';
import {ConversationVerificationBadges} from 'Components/Badge';
import {useCallAlertState} from 'Components/calling/useCallAlertState';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {LegalHoldDot} from 'Components/LegalHoldDot';
import {useConversationCall} from 'Hooks/useConversationCall';
import {useNoInternetCallGuard} from 'Hooks/useNoInternetCallGuard/useNoInternetCallGuard';
diff --git a/apps/webapp/src/script/components/UserDevices/components/DeviceCard/DeviceCard.tsx b/apps/webapp/src/script/components/UserDevices/components/DeviceCard/DeviceCard.tsx
index d58cae8a4d9..577eb74fe6c 100644
--- a/apps/webapp/src/script/components/UserDevices/components/DeviceCard/DeviceCard.tsx
+++ b/apps/webapp/src/script/components/UserDevices/components/DeviceCard/DeviceCard.tsx
@@ -30,7 +30,7 @@ import {t} from 'Util/localizerUtil';
import {splitFingerprint} from 'Util/stringUtil';
import {FormattedId} from '../../../../page/MainContent/panels/preferences/DevicesPreferences/components/FormattedId';
-import * as Icon from '../../../Icon';
+import * as Icon from '../../../icon';
interface DeviceCardProps {
click?: (device: ClientEntity) => void;
diff --git a/apps/webapp/src/script/components/UserList/UserList.tsx b/apps/webapp/src/script/components/UserList/UserList.tsx
index 62f2b73cb5e..39472232648 100644
--- a/apps/webapp/src/script/components/UserList/UserList.tsx
+++ b/apps/webapp/src/script/components/UserList/UserList.tsx
@@ -22,7 +22,7 @@ import {ChangeEvent, useCallback, useId, useMemo, useState} from 'react';
import cx from 'classnames';
import {container} from 'tsyringe';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {InViewport} from 'Components/InViewport';
import {collapseButton, collapseIcon} from 'Components/UserList/UserList.styles';
import type {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
diff --git a/apps/webapp/src/script/components/VerificationIcon/VerificationIcon.tsx b/apps/webapp/src/script/components/VerificationIcon/VerificationIcon.tsx
index 7faee2d07c3..f0165cbff71 100644
--- a/apps/webapp/src/script/components/VerificationIcon/VerificationIcon.tsx
+++ b/apps/webapp/src/script/components/VerificationIcon/VerificationIcon.tsx
@@ -17,7 +17,7 @@
*
*/
-import {VerifiedIcon, NotVerifiedIcon} from '../Icon';
+import {VerifiedIcon, NotVerifiedIcon} from '../icon';
interface VerificationIconProps {
className?: string;
diff --git a/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.tsx b/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.tsx
index 6125427c10e..2c587512800 100644
--- a/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.tsx
+++ b/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.tsx
@@ -21,7 +21,7 @@ import React from 'react';
import {TabIndex} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {UserInfo} from 'Components/UserInfo';
import {User} from 'Repositories/entity/User';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantStatusIcons.tsx b/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantStatusIcons.tsx
index 47516e9d727..f0e2f635b8c 100644
--- a/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantStatusIcons.tsx
+++ b/apps/webapp/src/script/components/calling/CallParticipantsListItem/CallParticipantStatusIcons.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Participant} from 'Repositories/calling/Participant';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/components/calling/CallingCell/CallIngParticipantList/CallingParticipantList.tsx b/apps/webapp/src/script/components/calling/CallingCell/CallIngParticipantList/CallingParticipantList.tsx
index bfc98191511..b7971c8aedf 100644
--- a/apps/webapp/src/script/components/calling/CallingCell/CallIngParticipantList/CallingParticipantList.tsx
+++ b/apps/webapp/src/script/components/calling/CallingCell/CallIngParticipantList/CallingParticipantList.tsx
@@ -25,7 +25,7 @@ import {Tooltip} from '@wireapp/react-ui-kit';
import {CallParticipantsListItem} from 'Components/calling/CallParticipantsListItem';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {CallingRepository} from 'Repositories/calling/CallingRepository';
import {Participant} from 'Repositories/calling/Participant';
import {Conversation} from 'Repositories/entity/Conversation';
diff --git a/apps/webapp/src/script/components/calling/CallingCell/CallingCell.tsx b/apps/webapp/src/script/components/calling/CallingCell/CallingCell.tsx
index 6c6fddaa2d1..5083cd4451c 100644
--- a/apps/webapp/src/script/components/calling/CallingCell/CallingCell.tsx
+++ b/apps/webapp/src/script/components/calling/CallingCell/CallingCell.tsx
@@ -32,7 +32,7 @@ import {CallingHeader} from 'Components/calling/CallingCell/CallingHeader';
import {GroupVideoGrid} from 'Components/calling/GroupVideoGrid';
import {useCallAlertState} from 'Components/calling/useCallAlertState';
import {ConversationClassifiedBar} from 'Components/ClassifiedBar/ClassifiedBar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useConversationCall} from 'Hooks/useConversationCall';
import {useNoInternetCallGuard} from 'Hooks/useNoInternetCallGuard/useNoInternetCallGuard';
import type {Call} from 'Repositories/calling/Call';
diff --git a/apps/webapp/src/script/components/calling/CallingCell/CallingControls/CallingControls.tsx b/apps/webapp/src/script/components/calling/CallingCell/CallingControls/CallingControls.tsx
index b6f3262e2f7..4ffeade627f 100644
--- a/apps/webapp/src/script/components/calling/CallingCell/CallingControls/CallingControls.tsx
+++ b/apps/webapp/src/script/components/calling/CallingCell/CallingControls/CallingControls.tsx
@@ -25,7 +25,7 @@ import {
cellControlsWrapper,
} from 'Components/calling/CallingCell/CallingControls/CallingControls.styles';
import {useCallAlertState} from 'Components/calling/useCallAlertState';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Call} from 'Repositories/calling/Call';
import {DesktopScreenShareMenu} from 'Repositories/calling/CallState';
import {Participant} from 'Repositories/calling/Participant';
diff --git a/apps/webapp/src/script/components/calling/CallingCell/CallingHeader/CallingHeader.tsx b/apps/webapp/src/script/components/calling/CallingCell/CallingHeader/CallingHeader.tsx
index 8ce7e91267f..6b2de10b80b 100644
--- a/apps/webapp/src/script/components/calling/CallingCell/CallingHeader/CallingHeader.tsx
+++ b/apps/webapp/src/script/components/calling/CallingCell/CallingHeader/CallingHeader.tsx
@@ -21,7 +21,7 @@ import {TabIndex, IconButton, IconButtonVariant} from '@wireapp/react-ui-kit';
import {Avatar, AVATAR_SIZE, ChannelAvatar, GroupAvatar} from 'Components/Avatar';
import {Duration} from 'Components/calling/Duration';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {User} from 'Repositories/entity/User';
import {isDetachedCallingFeatureEnabled} from 'Util/isDetachedCallingFeatureEnabled';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/calling/CallingCell/usePressSpaceToUnmute/usePressSpaceToUnmute.ts b/apps/webapp/src/script/components/calling/CallingCell/usePressSpaceToUnmute/usePressSpaceToUnmute.ts
index 7efb20a843c..57e69811425 100644
--- a/apps/webapp/src/script/components/calling/CallingCell/usePressSpaceToUnmute/usePressSpaceToUnmute.ts
+++ b/apps/webapp/src/script/components/calling/CallingCell/usePressSpaceToUnmute/usePressSpaceToUnmute.ts
@@ -22,7 +22,7 @@ import {amplify} from 'amplify';
import {WebAppEvents} from '@wireapp/webapp-events';
import {useAppNotification} from 'Components/AppNotification';
-import {MicOnIcon} from 'Components/Icon';
+import {MicOnIcon} from 'Components/icon';
import {useActiveWindowState} from 'Hooks/useActiveWindow';
import {useKeyPressAndHold} from 'Hooks/useKeyPressAndHold/useKeyPressAndHold';
import {CallingViewMode, CallState} from 'Repositories/calling/CallState';
diff --git a/apps/webapp/src/script/components/calling/FullscreenVideoCall.tsx b/apps/webapp/src/script/components/calling/FullscreenVideoCall.tsx
index bbffc4b679a..5997db36bf3 100644
--- a/apps/webapp/src/script/components/calling/FullscreenVideoCall.tsx
+++ b/apps/webapp/src/script/components/calling/FullscreenVideoCall.tsx
@@ -40,7 +40,7 @@ import {useAppNotification} from 'Components/AppNotification/AppNotification';
import {useCallAlertState} from 'Components/calling/useCallAlertState';
import {VideoBackgroundPerformancePanel} from 'Components/calling/VideoControls/videoBackgroundPerformancePanel/videoBackgroundPerformancePanel';
import {ConversationClassifiedBar} from 'Components/ClassifiedBar/ClassifiedBar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import type {Call} from 'Repositories/calling/Call';
import {CallingRepository} from 'Repositories/calling/CallingRepository';
diff --git a/apps/webapp/src/script/components/calling/GroupVideoGrid.tsx b/apps/webapp/src/script/components/calling/GroupVideoGrid.tsx
index b91a6a01571..c30530ac48d 100644
--- a/apps/webapp/src/script/components/calling/GroupVideoGrid.tsx
+++ b/apps/webapp/src/script/components/calling/GroupVideoGrid.tsx
@@ -25,7 +25,7 @@ import {QualifiedId} from '@wireapp/api-client/lib/user';
import {QUERY} from '@wireapp/react-ui-kit';
import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useActiveWindowMatchMedia} from 'Hooks/useActiveWindowMatchMedia';
import {Call} from 'Repositories/calling/Call';
import type {Participant} from 'Repositories/calling/Participant';
diff --git a/apps/webapp/src/script/components/calling/GroupVideoGridTile.tsx b/apps/webapp/src/script/components/calling/GroupVideoGridTile.tsx
index a5608e0087a..4073dde53cb 100644
--- a/apps/webapp/src/script/components/calling/GroupVideoGridTile.tsx
+++ b/apps/webapp/src/script/components/calling/GroupVideoGridTile.tsx
@@ -35,7 +35,7 @@ import {
groupVideoPauseOverlayLabel,
groupVideoTileWrapper,
} from 'Components/calling/GroupVideoGridTile.styles';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import type {Participant} from 'Repositories/calling/Participant';
import {useKoSubscribableChildren} from 'Util/componentUtil';
import {isEnterKey} from 'Util/keyboardUtil';
diff --git a/apps/webapp/src/script/components/calling/ParticipantMicOnIcon.tsx b/apps/webapp/src/script/components/calling/ParticipantMicOnIcon.tsx
index bbaf91728e2..64fe5fa0999 100644
--- a/apps/webapp/src/script/components/calling/ParticipantMicOnIcon.tsx
+++ b/apps/webapp/src/script/components/calling/ParticipantMicOnIcon.tsx
@@ -19,7 +19,7 @@
import {keyframes} from '@emotion/react';
-import {MicOnIcon} from 'Components/Icon';
+import {MicOnIcon} from 'Components/icon';
const fadeAnimation = keyframes`
0% { opacity: 0.2; }
diff --git a/apps/webapp/src/script/components/calling/VideoControls/VideoBackgroundSettings/VideoBackgroundSettings.tsx b/apps/webapp/src/script/components/calling/VideoControls/VideoBackgroundSettings/VideoBackgroundSettings.tsx
index 4ef96e36b51..a7efc7f7eda 100644
--- a/apps/webapp/src/script/components/calling/VideoControls/VideoBackgroundSettings/VideoBackgroundSettings.tsx
+++ b/apps/webapp/src/script/components/calling/VideoControls/VideoBackgroundSettings/VideoBackgroundSettings.tsx
@@ -24,7 +24,7 @@ import {match} from 'ts-pattern';
import {BlurHighIcon, BlurLowIcon, Checkbox, CheckboxLabel, CircleIcon} from '@wireapp/react-ui-kit';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import type {BackgroundEffectSelection, BuiltinBackground} from 'Repositories/media/VideoBackgroundEffects';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/calling/VideoControls/VideoCallCancelButton/VideoCallCancelButton.tsx b/apps/webapp/src/script/components/calling/VideoControls/VideoCallCancelButton/VideoCallCancelButton.tsx
index ab49d5c627b..6e58b1afeb0 100644
--- a/apps/webapp/src/script/components/calling/VideoControls/VideoCallCancelButton/VideoCallCancelButton.tsx
+++ b/apps/webapp/src/script/components/calling/VideoControls/VideoCallCancelButton/VideoCallCancelButton.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {handleKeyDown, KEY} from 'Util/keyboardUtil';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/components/calling/VideoControls/VideoControls.tsx b/apps/webapp/src/script/components/calling/VideoControls/VideoControls.tsx
index 16204948e3e..3bfc81196c0 100644
--- a/apps/webapp/src/script/components/calling/VideoControls/VideoControls.tsx
+++ b/apps/webapp/src/script/components/calling/VideoControls/VideoControls.tsx
@@ -37,7 +37,7 @@ import {
} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useActiveWindowMatchMedia} from 'Hooks/useActiveWindowMatchMedia';
import {useUserPropertyValue} from 'Hooks/useUserProperty';
import {Call} from 'Repositories/calling/Call';
diff --git a/apps/webapp/src/script/components/calling/VideoControls/VideoControlsSelect/VideoControlsSelect.tsx b/apps/webapp/src/script/components/calling/VideoControls/VideoControlsSelect/VideoControlsSelect.tsx
index 59d270469a8..fd9e78f2e3c 100644
--- a/apps/webapp/src/script/components/calling/VideoControls/VideoControlsSelect/VideoControlsSelect.tsx
+++ b/apps/webapp/src/script/components/calling/VideoControls/VideoControlsSelect/VideoControlsSelect.tsx
@@ -22,7 +22,7 @@ import React from 'react';
import {Select} from '@wireapp/react-ui-kit';
import {selectGroupStyles} from 'Components/calling/VideoControls/VideoControlsSelect/VideoControlsSelect.styles';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileHistoryHeader.tsx b/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileHistoryHeader.tsx
index 37d2469e5cc..15c571735f8 100644
--- a/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileHistoryHeader.tsx
+++ b/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileHistoryHeader.tsx
@@ -19,7 +19,7 @@
import {FileTypeIcon} from 'Components/Conversation/common/FileTypeIcon/FileTypeIcon';
import {FileLoader} from 'Components/FileFullscreenModal/FileLoader/FileLoader';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx b/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx
index 16fadc4fcc6..32f0ad7e227 100644
--- a/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx
+++ b/apps/webapp/src/script/components/components/Modals/FileHistoryModal/FileRestoreConfirmContent.tsx
@@ -19,7 +19,7 @@
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/components/panel/PanelActions/PanelActions.test.tsx b/apps/webapp/src/script/components/panel/PanelActions/PanelActions.test.tsx
index 37632f63cce..da329a20bfa 100644
--- a/apps/webapp/src/script/components/panel/PanelActions/PanelActions.test.tsx
+++ b/apps/webapp/src/script/components/panel/PanelActions/PanelActions.test.tsx
@@ -19,7 +19,7 @@
import {render, fireEvent} from '@testing-library/react';
-import {CopyIcon, EditIcon, PickupIcon} from 'Components/Icon';
+import {CopyIcon, EditIcon, PickupIcon} from 'Components/icon';
import {PanelActions, MenuItem} from './PanelActions';
diff --git a/apps/webapp/src/script/components/panel/UserActions.tsx b/apps/webapp/src/script/components/panel/UserActions.tsx
index 58e4a8c041c..62989c9cceb 100644
--- a/apps/webapp/src/script/components/panel/UserActions.tsx
+++ b/apps/webapp/src/script/components/panel/UserActions.tsx
@@ -25,7 +25,7 @@ import {container} from 'tsyringe';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {PrimaryModal} from 'Components/Modals/PrimaryModal';
import {listCSS} from 'Components/panel/PanelActions/PanelActions.styles';
import {ACCESS_STATE} from 'Repositories/conversation/AccessState';
diff --git a/apps/webapp/src/script/components/panel/UserDetails.tsx b/apps/webapp/src/script/components/panel/UserDetails.tsx
index b07e5e7840e..c6ce02eb515 100644
--- a/apps/webapp/src/script/components/panel/UserDetails.tsx
+++ b/apps/webapp/src/script/components/panel/UserDetails.tsx
@@ -28,7 +28,7 @@ import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
import {UserBlockedBadge, UserVerificationBadges} from 'Components/Badge';
import {UserClassifiedBar} from 'Components/ClassifiedBar/ClassifiedBar';
import {ErrorFallback} from 'Components/ErrorFallback';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {UserInfo} from 'Components/UserInfo';
import {User} from 'Repositories/entity/User';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/components/toggle/ReceiptModeToggle.tsx b/apps/webapp/src/script/components/toggle/ReceiptModeToggle.tsx
index 5ae2dcd17f3..64a1074fff1 100644
--- a/apps/webapp/src/script/components/toggle/ReceiptModeToggle.tsx
+++ b/apps/webapp/src/script/components/toggle/ReceiptModeToggle.tsx
@@ -24,7 +24,7 @@ import cx from 'classnames';
import {t} from 'Util/localizerUtil';
-import * as Icon from '../Icon';
+import * as Icon from '../icon';
interface ReceiptModeToggleProps {
onReceiptModeChanged: (receiptMode: RECEIPT_MODE) => void;
diff --git a/apps/webapp/src/script/page/AppLock/AppLock.tsx b/apps/webapp/src/script/page/AppLock/AppLock.tsx
index 48d9c039aea..1f9e675493b 100644
--- a/apps/webapp/src/script/page/AppLock/AppLock.tsx
+++ b/apps/webapp/src/script/page/AppLock/AppLock.tsx
@@ -27,7 +27,7 @@ import {ValidationUtil} from '@wireapp/commons';
import {Button, ButtonVariant, Checkbox, CheckboxLabel, Input, Link, LinkVariant} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {ClientRepository} from 'Repositories/client';
import {ClientState} from 'Repositories/client/ClientState';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationHeader/ConversationHeader.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationHeader/ConversationHeader.tsx
index 5fde81fc051..58fb60d0853 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationHeader/ConversationHeader.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationHeader/ConversationHeader.tsx
@@ -24,7 +24,7 @@ import {amplify} from 'amplify';
import {CircleCloseIcon, IconButton, Input, SearchIcon} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useCreateConversationModal} from 'Components/Modals/CreateConversation/hooks/useCreateConversationModal';
import {ConversationLabel} from 'Repositories/conversation/ConversationLabelRepository';
import {User} from 'Repositories/entity/User';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.test.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.test.tsx
index 4f6f110e28a..e92961fcc33 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.test.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.test.tsx
@@ -19,7 +19,7 @@
import {render} from '@testing-library/react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {createLabel, LabelType} from 'Repositories/conversation/ConversationLabelRepository';
import {Conversation} from 'Repositories/entity/Conversation';
import {TestFactory} from 'test/helper/TestFactory';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.tsx
index f1dacf10350..b4c8a72b36d 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTab/ConversationFolderTab.tsx
@@ -21,7 +21,7 @@ import {useMemo} from 'react';
import cx from 'classnames';
-import * as Icons from 'Components/Icon';
+import * as Icons from 'Components/icon';
import {createLabel, LabelType} from 'Repositories/conversation/ConversationLabelRepository';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
import {Conversation} from 'Repositories/entity/Conversation';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/ConversationTabs.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/ConversationTabs.tsx
index f08a738f4f9..572145de184 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/ConversationTabs.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/ConversationTabs.tsx
@@ -31,7 +31,7 @@ import {
Tooltip,
} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
import {Conversation} from 'Repositories/entity/Conversation';
import {User} from 'Repositories/entity/User';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/FolderIcon.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/FolderIcon.tsx
index 945c4498d5e..62386dd0f2d 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/FolderIcon.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/FolderIcon.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {SidebarStatus, useSidebarStore} from '../useSidebarStore';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/ConfirmLeaveModal.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/ConfirmLeaveModal.tsx
index e7e4df92925..4f38ae25a5c 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/ConfirmLeaveModal.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/ConfirmLeaveModal.tsx
@@ -22,7 +22,7 @@ import {amplify} from 'amplify';
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {EventName} from 'Repositories/tracking/eventName';
import {Segmentation} from 'Repositories/tracking/segmentation';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx
index 172008d173d..a384552a2c4 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationAccountHeader.tsx
@@ -19,7 +19,7 @@
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationBanner.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationBanner.tsx
index ddea8ff35f9..62068217416 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationBanner.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationBanner.tsx
@@ -25,7 +25,7 @@ import {Button, ButtonVariant, IconButton} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
import {BannerPortal} from 'Components/BannerPortal/BannerPortal';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {EventName} from 'Repositories/tracking/eventName';
import {Segmentation} from 'Repositories/tracking/segmentation';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationModal.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationModal.tsx
index f07be351dbb..78db4cf0d4e 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationModal.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/ConversationTabs/TeamCreation/TeamCreationModal.tsx
@@ -23,7 +23,7 @@ import {amplify} from 'amplify';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ModalComponent} from 'Components/Modals/ModalComponent';
import {EventName} from 'Repositories/tracking/eventName';
import {Segmentation} from 'Repositories/tracking/segmentation';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.test.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.test.tsx
index 1890fb40473..cae8a5b67c1 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.test.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.test.tsx
@@ -44,7 +44,7 @@ jest.mock('Util/componentUtil', () => ({
useKoSubscribableChildren: () => ({isCellsEnabled: false}),
}));
-jest.mock('Components/Icon', () => ({
+jest.mock('Components/icon', () => ({
SettingsIcon: () => ,
}));
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.tsx
index 78101b60d05..14e48150489 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Conversations/tabAndFilterSettings/tabAndFilterSettings.tsx
@@ -21,7 +21,7 @@ import {useCallback, useEffect, useId, useRef, useState} from 'react';
import {Checkbox, CheckboxLabel, TabIndex} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {Config} from 'src/script/Config';
import {SidebarTabs, useSidebarStore} from 'src/script/page/LeftSidebar/panels/Conversations/useSidebarStore';
import {handleEscDown, isEnterKey, isKey, isSpaceKey, KEY} from 'Util/keyboardUtil';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/ListWrapper.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/ListWrapper.tsx
index f010ca4da2d..851707882d6 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/ListWrapper.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/ListWrapper.tsx
@@ -23,7 +23,7 @@ import {css} from '@emotion/react';
import {throttle} from 'underscore';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useConnectionQuality} from 'src/script/hooks/useConnectionQuality';
import {t} from 'Util/localizerUtil';
import {isScrollable, isScrolledBottom, isScrolledTop} from 'Util/scrollHelpers';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/Preferences.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/Preferences.tsx
index bc96965e1b1..1757645c038 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/Preferences.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/Preferences.tsx
@@ -25,7 +25,7 @@ import {Runtime} from '@wireapp/commons';
import {TabIndex} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {PrimaryModal} from 'Components/Modals/PrimaryModal';
import {
ClientNotificationData,
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
index 11036cff11c..0394ce339b2 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
@@ -24,7 +24,7 @@ import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
import {partition} from 'underscore';
import {useDebouncedCallback} from 'use-debounce';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {UserList, UserlistMode} from 'Components/UserList';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
import {ConversationState} from 'Repositories/conversation/ConversationState';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/ServicesTab.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/ServicesTab.tsx
index a4753ba1ac5..d7a63408d9b 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/ServicesTab.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/StartUI/ServicesTab.tsx
@@ -23,7 +23,7 @@ import {useDebouncedCallback} from 'use-debounce';
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ServiceList} from 'Components/ServiceList/ServiceList';
import {IntegrationRepository} from 'Repositories/integration/IntegrationRepository';
import {ServiceEntity} from 'Repositories/integration/ServiceEntity';
diff --git a/apps/webapp/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx b/apps/webapp/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx
index aba2838972e..67bbb3a888d 100644
--- a/apps/webapp/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx
+++ b/apps/webapp/src/script/page/LeftSidebar/panels/TemporatyGuestConversations.tsx
@@ -18,7 +18,7 @@
*/
import {CallingCell} from 'Components/calling/CallingCell';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {PrimaryModal} from 'Components/Modals/PrimaryModal';
import {User} from 'Repositories/entity/User';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/page/MainContent/MainContent.tsx b/apps/webapp/src/script/page/MainContent/MainContent.tsx
index 641a4fc4878..ebc43b2ed5c 100644
--- a/apps/webapp/src/script/page/MainContent/MainContent.tsx
+++ b/apps/webapp/src/script/page/MainContent/MainContent.tsx
@@ -29,7 +29,7 @@ import {ConnectRequests} from 'Components/ConnectRequests';
import {Conversation} from 'Components/Conversation';
import {HistoryExport} from 'Components/HistoryExport';
import {HistoryImport} from 'Components/HistoryImport';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useLegalHoldModalState} from 'Components/Modals/LegalHoldModal/LegalHoldModal.state';
import {ClientState} from 'Repositories/client/ClientState';
import {ConversationState} from 'Repositories/conversation/ConversationState';
diff --git a/apps/webapp/src/script/page/MainContent/panels/Collection/Collection.tsx b/apps/webapp/src/script/page/MainContent/panels/Collection/Collection.tsx
index 81237ca2432..1ddaeb531df 100644
--- a/apps/webapp/src/script/page/MainContent/panels/Collection/Collection.tsx
+++ b/apps/webapp/src/script/page/MainContent/panels/Collection/Collection.tsx
@@ -25,7 +25,7 @@ import {amplify} from 'amplify';
import {ChevronIcon, SecondaryButton} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {showDetailViewModal} from 'Components/Modals/DetailViewModal';
import {AssetRepository} from 'Repositories/assets/assetRepository';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
diff --git a/apps/webapp/src/script/page/MainContent/panels/preferences/DevicesPreferences/components/Device/Device.tsx b/apps/webapp/src/script/page/MainContent/panels/preferences/DevicesPreferences/components/Device/Device.tsx
index a6efc956ebb..a50c8a5ccb3 100644
--- a/apps/webapp/src/script/page/MainContent/panels/preferences/DevicesPreferences/components/Device/Device.tsx
+++ b/apps/webapp/src/script/page/MainContent/panels/preferences/DevicesPreferences/components/Device/Device.tsx
@@ -22,7 +22,7 @@ import {MouseEvent, KeyboardEvent} from 'react';
import {TabIndex} from '@wireapp/react-ui-kit';
import {DeviceVerificationBadges} from 'Components/Badge';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ClientEntity} from 'Repositories/client';
import {WireIdentity} from 'src/script/E2EIdentity';
import {useKoSubscribableChildren} from 'Util/componentUtil';
diff --git a/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountInput.tsx b/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountInput.tsx
index 3dfdb3845b1..3fa5a1be081 100644
--- a/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountInput.tsx
+++ b/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountInput.tsx
@@ -21,7 +21,7 @@ import {FC, InputHTMLAttributes, useEffect, useRef, useState} from 'react';
import {IconButton, IconButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {TextInput} from 'Components/TextInput';
import {useIsMounted} from 'Util/useIsMounted';
diff --git a/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountLink.tsx b/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountLink.tsx
index e91b996fa23..66b52769ae5 100644
--- a/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountLink.tsx
+++ b/apps/webapp/src/script/page/MainContent/panels/preferences/accountPreferences/AccountLink.tsx
@@ -19,7 +19,7 @@
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {copyText} from 'Util/clipboardUtil';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx b/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx
index 5fe6ffc1acc..f7fc58f1823 100644
--- a/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx
+++ b/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx
@@ -19,7 +19,7 @@
import {FunctionComponent} from 'react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {useMediaDevicesStore} from 'Repositories/media/useMediaDevicesStore';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx b/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx
index 0530e23ed14..0972259664f 100644
--- a/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx
+++ b/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx
@@ -21,7 +21,7 @@ import {memo, useCallback, useEffect, useRef, useState} from 'react';
import {useDebouncedCallback} from 'use-debounce';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {MediaStreamHandler} from 'Repositories/media/MediaStreamHandler';
import {MediaType} from 'Repositories/media/MediaType';
import {useMediaDevicesStore} from 'Repositories/media/useMediaDevicesStore';
diff --git a/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx b/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx
index 627efdc7333..f27750b1f6f 100644
--- a/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx
+++ b/apps/webapp/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx
@@ -21,7 +21,7 @@ import {useEffect, useState} from 'react';
import {useDebouncedCallback} from 'use-debounce';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {MediaDevicesHandler} from 'Repositories/media/MediaDevicesHandler';
import {MediaStreamHandler} from 'Repositories/media/MediaStreamHandler';
import {MediaType} from 'Repositories/media/MediaType';
diff --git a/apps/webapp/src/script/page/RightSidebar/addParticipants/addParticipants.tsx b/apps/webapp/src/script/page/RightSidebar/addParticipants/addParticipants.tsx
index e168be4ced4..6f8f6aefc4f 100644
--- a/apps/webapp/src/script/page/RightSidebar/addParticipants/addParticipants.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/addParticipants/addParticipants.tsx
@@ -27,7 +27,7 @@ import cx from 'classnames';
import {Button, ButtonVariant, TabIndex} from '@wireapp/react-ui-kit';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {SearchInput} from 'Components/SearchInput';
import {ServiceList} from 'Components/ServiceList/ServiceList';
import {UserSearchableList} from 'Components/UserSearchableList';
diff --git a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsBottomActions/conversationDetailsBottomActions.tsx b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsBottomActions/conversationDetailsBottomActions.tsx
index cd0696c367e..2fe1fd3a557 100644
--- a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsBottomActions/conversationDetailsBottomActions.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsBottomActions/conversationDetailsBottomActions.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
interface ConversationDetailsBottomActionsProps {
diff --git a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsHeader/conversationDetailsHeader.tsx b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsHeader/conversationDetailsHeader.tsx
index 7c09c9558aa..441b7566ecd 100644
--- a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsHeader/conversationDetailsHeader.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsHeader/conversationDetailsHeader.tsx
@@ -20,7 +20,7 @@
import {ChangeEvent, FC, KeyboardEvent, useEffect, useRef, useState} from 'react';
import {ConversationVerificationBadges} from 'Components/Badge';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
import {Conversation} from 'Repositories/entity/Conversation';
import {User} from 'Repositories/entity/User';
diff --git a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOption.tsx b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOption.tsx
index 54c1b4539e2..9e6ad3dd0dc 100644
--- a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOption.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOption.tsx
@@ -19,7 +19,7 @@
import {FC, ReactElement} from 'react';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
interface ConversationDetailsOptionProps {
className: string;
diff --git a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOptions.tsx b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOptions.tsx
index 35ca1e155d4..b686fb56ff5 100644
--- a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOptions.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsOptions/conversationDetailsOptions.tsx
@@ -24,7 +24,7 @@ import {amplify} from 'amplify';
import {CollectionIcon, HideIcon, HistoryIcon, LockClosedIcon, UnlockedIcon} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {PanelActions} from 'Components/panel/PanelActions';
import {ReceiptModeToggle} from 'Components/toggle/ReceiptModeToggle';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
diff --git a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsParticipants/conversationDetailsParticipants.tsx b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsParticipants/conversationDetailsParticipants.tsx
index e5486ddad7a..7caec8556a7 100644
--- a/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsParticipants/conversationDetailsParticipants.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/conversationDetails/components/conversationDetailsParticipants/conversationDetailsParticipants.tsx
@@ -17,7 +17,7 @@
*
*/
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ServiceList} from 'Components/ServiceList';
import {UserList} from 'Components/UserList';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
diff --git a/apps/webapp/src/script/page/RightSidebar/conversationDetails/conversationDetails.tsx b/apps/webapp/src/script/page/RightSidebar/conversationDetails/conversationDetails.tsx
index a13e2c8de60..ac85cb191bd 100644
--- a/apps/webapp/src/script/page/RightSidebar/conversationDetails/conversationDetails.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/conversationDetails/conversationDetails.tsx
@@ -27,7 +27,7 @@ import {UserType} from '@wireapp/api-client/lib/user';
import {TabIndex} from '@wireapp/react-ui-kit';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ConversationProtocolDetails} from 'Components/panel/ConversationProtocolDetails/ConversationProtocolDetails';
import {EnrichedFields} from 'Components/panel/EnrichedFields';
import {ServiceDetails} from 'Components/panel/ServiceDetails';
diff --git a/apps/webapp/src/script/page/RightSidebar/conversationDetails/utils/getConversationActions.ts b/apps/webapp/src/script/page/RightSidebar/conversationDetails/utils/getConversationActions.ts
index 4481ed648d2..3cec916afcb 100644
--- a/apps/webapp/src/script/page/RightSidebar/conversationDetails/utils/getConversationActions.ts
+++ b/apps/webapp/src/script/page/RightSidebar/conversationDetails/utils/getConversationActions.ts
@@ -21,7 +21,7 @@ import {amplify} from 'amplify';
import {WebAppEvents} from '@wireapp/webapp-events';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {MenuItem} from 'Components/panel/PanelActions';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
import {Conversation} from 'Repositories/entity/Conversation';
diff --git a/apps/webapp/src/script/page/RightSidebar/groupParticipantService/groupParticipantService.tsx b/apps/webapp/src/script/page/RightSidebar/groupParticipantService/groupParticipantService.tsx
index 2c68e69928d..e8a32f10496 100644
--- a/apps/webapp/src/script/page/RightSidebar/groupParticipantService/groupParticipantService.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/groupParticipantService/groupParticipantService.tsx
@@ -24,7 +24,7 @@ import is from '@sindresorhus/is';
import {TabIndex} from '@wireapp/react-ui-kit';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {ServiceDetails} from 'Components/panel/ServiceDetails';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
import {Conversation} from 'Repositories/entity/Conversation';
diff --git a/apps/webapp/src/script/page/RightSidebar/groupParticipantUser/groupParticipantUser.tsx b/apps/webapp/src/script/page/RightSidebar/groupParticipantUser/groupParticipantUser.tsx
index 543e97c57be..ad7652e2842 100644
--- a/apps/webapp/src/script/page/RightSidebar/groupParticipantUser/groupParticipantUser.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/groupParticipantUser/groupParticipantUser.tsx
@@ -26,7 +26,7 @@ import {TabIndex} from '@wireapp/react-ui-kit';
import {WebAppEvents} from '@wireapp/webapp-events';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {EnrichedFields} from 'Components/panel/EnrichedFields';
import {UserActions, Actions} from 'Components/panel/UserActions';
import {UserDetails} from 'Components/panel/UserDetails';
diff --git a/apps/webapp/src/script/page/RightSidebar/guestServicesOptions/components/guestOptions/guestOptions.tsx b/apps/webapp/src/script/page/RightSidebar/guestServicesOptions/components/guestOptions/guestOptions.tsx
index 1cf2ba66a6d..12b9e5e7130 100644
--- a/apps/webapp/src/script/page/RightSidebar/guestServicesOptions/components/guestOptions/guestOptions.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/guestServicesOptions/components/guestOptions/guestOptions.tsx
@@ -24,7 +24,7 @@ import {container} from 'tsyringe';
import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {PrimaryModal} from 'Components/Modals/PrimaryModal';
import {RadioGroup} from 'Components/Radio';
import {SelectText} from 'Components/SelectText';
diff --git a/apps/webapp/src/script/page/RightSidebar/messageDetails/messageDetails.tsx b/apps/webapp/src/script/page/RightSidebar/messageDetails/messageDetails.tsx
index 539b31a14a9..43244962289 100644
--- a/apps/webapp/src/script/page/RightSidebar/messageDetails/messageDetails.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/messageDetails/messageDetails.tsx
@@ -22,7 +22,7 @@ import {FC, useMemo, useState} from 'react';
import cx from 'classnames';
import {FadingScrollbar} from 'Components/FadingScrollbar';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {UserList} from 'Components/UserList';
import {ConversationRepository} from 'Repositories/conversation/ConversationRepository';
import {Conversation} from 'Repositories/entity/Conversation';
diff --git a/apps/webapp/src/script/page/RightSidebar/panelHeader/panelHeader.tsx b/apps/webapp/src/script/page/RightSidebar/panelHeader/panelHeader.tsx
index 3076b3e5ba6..90f1f078d95 100644
--- a/apps/webapp/src/script/page/RightSidebar/panelHeader/panelHeader.tsx
+++ b/apps/webapp/src/script/page/RightSidebar/panelHeader/panelHeader.tsx
@@ -24,7 +24,7 @@ import cx from 'classnames';
import {TabIndex} from '@wireapp/react-ui-kit';
import {DraggableClickWrapper} from 'Components/DraggableClickWrapper';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {noop} from 'Util/util';
diff --git a/apps/webapp/src/script/ui/ContextMenu.tsx b/apps/webapp/src/script/ui/ContextMenu.tsx
index e3a4c6e2668..fe5a3bc062b 100644
--- a/apps/webapp/src/script/ui/ContextMenu.tsx
+++ b/apps/webapp/src/script/ui/ContextMenu.tsx
@@ -25,7 +25,7 @@ import {createRoot, Root} from 'react-dom/client';
import {Availability} from '@wireapp/protocol-messaging';
import {StyledApp, THEME_ID} from '@wireapp/react-ui-kit';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {IgnoreOutsideClickWrapper} from 'Components/InputBar/util/clickHandlers';
import {useMessageActionsState} from 'Components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.state';
import {isEnterKey, isEscapeKey, isKey, isOneOfKeys, isSpaceKey, KEY} from 'Util/keyboardUtil';
diff --git a/apps/webapp/src/script/ui/LabelContextMenu.ts b/apps/webapp/src/script/ui/LabelContextMenu.ts
index bf09e6126a2..63d5324ecce 100644
--- a/apps/webapp/src/script/ui/LabelContextMenu.ts
+++ b/apps/webapp/src/script/ui/LabelContextMenu.ts
@@ -17,7 +17,7 @@
*
*/
-import {PlusIcon} from 'Components/Icon';
+import {PlusIcon} from 'Components/icon';
import type {ConversationLabelRepository} from 'Repositories/conversation/ConversationLabelRepository';
import type {Conversation} from 'Repositories/entity/Conversation';
import {t} from 'Util/localizerUtil';
diff --git a/apps/webapp/src/script/util/availabilityStatus.tsx b/apps/webapp/src/script/util/availabilityStatus.tsx
index a73b36e7178..acf744d9ef9 100644
--- a/apps/webapp/src/script/util/availabilityStatus.tsx
+++ b/apps/webapp/src/script/util/availabilityStatus.tsx
@@ -21,7 +21,7 @@ import {CSSObject} from '@emotion/serialize';
import {Availability} from '@wireapp/protocol-messaging';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {CSS_SQUARE} from 'Util/cssMixin';
const iconStyles: CSSObject = {
diff --git a/apps/webapp/src/script/view_model/WarningsContainer/WarningsContainer.tsx b/apps/webapp/src/script/view_model/WarningsContainer/WarningsContainer.tsx
index a20bb26a6b3..3aa303b4f7e 100644
--- a/apps/webapp/src/script/view_model/WarningsContainer/WarningsContainer.tsx
+++ b/apps/webapp/src/script/view_model/WarningsContainer/WarningsContainer.tsx
@@ -23,7 +23,7 @@ import cx from 'classnames';
import {Runtime} from '@wireapp/commons';
-import * as Icon from 'Components/Icon';
+import * as Icon from 'Components/icon';
import {t} from 'Util/localizerUtil';
import {afterRender} from 'Util/util';
diff --git a/eslint.config.ts b/eslint.config.ts
index 400f96d328b..508a0596d44 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -47,7 +47,7 @@ const ignores = [
'apps/webapp/src/ext/',
'apps/webapp/src/script/localization/**/webapp*.js',
'apps/webapp/src/worker/',
- 'apps/webapp/src/script/components/Icon.tsx',
+ 'apps/webapp/src/script/components/icon.tsx',
'**/*.test.*',
'**/*.spec.*',
'*.js',