41 files changed, 59 insertions, 59 deletions

diff --git a/src/components/AppUpdateInfoBar.tsx b/src/components/AppUpdateInfoBar.tsx
index 576da0f85..48efbfb7f 100644
--- a/src/components/AppUpdateInfoBar.tsx
+++ b/src/components/AppUpdateInfoBar.tsx
@@ -4,7 +4,7 @@ import { mdiInformation } from '@mdi/js';
 import InfoBar from './ui/InfoBar';
 import { GITHUB_FERDIUM_URL } from '../config';
 import { openExternalUrl } from '../helpers/url-helpers';
-import { Icon } from './ui/icon';
+import Icon from './ui/icon';
 
 const messages = defineMessages({
   updateAvailable: {
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js
index 21c874c0f..77b91fa1c 100644
--- a/src/components/auth/AuthLayout.js
+++ b/src/components/auth/AuthLayout.js
@@ -19,7 +19,7 @@ import globalMessages from '../../i18n/globalMessages';
 import { isWindows } from '../../environment';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import { GITHUB_FERDIUM_URL } from '../../config';
-import { Icon } from '../ui/icon';
+import Icon from '../ui/icon';
 
 class AuthLayout extends Component {
   static propTypes = {
diff --git a/src/components/auth/SetupAssistant.js b/src/components/auth/SetupAssistant.js
index 7658eb1ff..e3d2d88d1 100644
--- a/src/components/auth/SetupAssistant.js
+++ b/src/components/auth/SetupAssistant.js
@@ -5,11 +5,11 @@ import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
-import { Input } from '../ui/input/index';
+import Input from '../ui/input/index';
 import Button from '../ui/button';
-import { Badge } from '../ui/badge';
+import Badge from '../ui/badge';
 import Modal from '../ui/Modal';
-import * as Infobox from '../ui/Infobox';
+import Infobox from '../ui/Infobox';
 import Appear from '../ui/effects/Appear';
 import globalMessages from '../../i18n/globalMessages';
 
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index fc3c89fc8..e22d4eb50 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -20,7 +20,7 @@ import WorkspaceSwitchingIndicator from '../../features/workspaces/components/Wo
 import { workspaceStore } from '../../features/workspaces';
 import AppUpdateInfoBar from '../AppUpdateInfoBar';
 import Todos from '../../features/todos/containers/TodosScreen';
-import { Icon } from '../ui/icon';
+import Icon from '../ui/icon';
 
 import LockedScreen from '../../containers/auth/LockedScreen';
 
diff --git a/src/components/layout/Sidebar.jsx b/src/components/layout/Sidebar.jsx
index 6949544b4..dd81f4ab5 100644
--- a/src/components/layout/Sidebar.jsx
+++ b/src/components/layout/Sidebar.jsx
@@ -32,7 +32,7 @@ import { todoActions } from '../../features/todos/actions';
 import AppStore from '../../stores/AppStore';
 import SettingsStore from '../../stores/SettingsStore';
 import globalMessages from '../../i18n/globalMessages';
-import { Icon } from '../ui/icon';
+import Icon from '../ui/icon';
 
 const messages = defineMessages({
   addNewService: {
diff --git a/src/components/services/content/ConnectionLostBanner.js b/src/components/services/content/ConnectionLostBanner.js
index 4f68c1bfe..f2f70ca2e 100644
--- a/src/components/services/content/ConnectionLostBanner.js
+++ b/src/components/services/content/ConnectionLostBanner.js
@@ -6,7 +6,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { mdiAlert } from '@mdi/js';
 import { LIVE_API_FERDIUM_WEBSITE } from '../../../config';
-import { Icon } from '../../ui/icon';
+import Icon from '../../ui/icon';
 
 const messages = defineMessages({
   text: {
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index dd5a80e67..9d2b6b333 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -14,7 +14,7 @@ import ServiceModel from '../../../models/Service';
 import { cmdOrCtrlShortcutKey, shiftKey, altKey } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
 import SettingsStore from '../../../stores/SettingsStore';
-import { Icon } from '../../ui/icon';
+import Icon from '../../ui/icon';
 
 const IS_SERVICE_DEBUGGING_ENABLED = (
   localStorage.getItem('debug') || ''
diff --git a/src/components/settings/SettingsLayout.js b/src/components/settings/SettingsLayout.js
index de13e95ab..d70f471d5 100644
--- a/src/components/settings/SettingsLayout.js
+++ b/src/components/settings/SettingsLayout.js
@@ -7,7 +7,7 @@ import { mdiClose } from '@mdi/js';
 import ErrorBoundary from '../util/ErrorBoundary';
 import { oneOrManyChildElements } from '../../prop-types';
 import Appear from '../ui/effects/Appear';
-import { Icon } from '../ui/icon';
+import Icon from '../ui/icon';
 
 const messages = defineMessages({
   closeSettings: {
diff --git a/src/components/settings/recipes/RecipesDashboard.js b/src/components/settings/recipes/RecipesDashboard.js
index f52d068be..c05144117 100644
--- a/src/components/settings/recipes/RecipesDashboard.js
+++ b/src/components/settings/recipes/RecipesDashboard.js
@@ -8,8 +8,8 @@ import injectSheet from 'react-jss';
 
 import { mdiOpenInNew } from '@mdi/js';
 import Button from '../../ui/button';
-import { Input } from '../../ui/input/index';
-import { H3, H2, H1 } from '../../ui/headline';
+import Input from '../../ui/input/index';
+import { H1, H2, H3 } from '../../ui/headline';
 import SearchInput from '../../ui/SearchInput';
 import Infobox from '../../ui/Infobox';
 import RecipeItem from './RecipeItem';
@@ -17,7 +17,7 @@ import Loader from '../../ui/Loader';
 import Appear from '../../ui/effects/Appear';
 import { FERDIUM_SERVICE_REQUEST } from '../../../config';
 import RecipePreview from '../../../models/RecipePreview';
-import { Icon } from '../../ui/icon';
+import Icon from '../../ui/icon';
 
 const messages = defineMessages({
   headline: {
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index e6cd68252..3da0246ac 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -10,7 +10,7 @@ import Form from '../../../lib/Form';
 import Recipe from '../../../models/Recipe';
 import Service from '../../../models/Service';
 import Tabs from '../../ui/Tabs/Tabs';
-import { TabItem } from '../../ui/Tabs/TabItem';
+import TabItem from '../../ui/Tabs/TabItem';
 import Input from '../../ui/Input';
 import Toggle from '../../ui/Toggle';
 import Slider from '../../ui/Slider';
@@ -20,7 +20,7 @@ import Select from '../../ui/Select';
 
 import { isMac } from '../../../environment';
 import globalMessages from '../../../i18n/globalMessages';
-import { Icon } from '../../ui/icon';
+import Icon from '../../ui/icon';
 import { H3 } from '../../ui/headline';
 
 const messages = defineMessages({
diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js
index 23250ad09..c666b7dd2 100644
--- a/src/components/settings/services/ServiceItem.js
+++ b/src/components/settings/services/ServiceItem.js
@@ -7,7 +7,7 @@ import classnames from 'classnames';
 
 import { mdiBellOff, mdiMessageBulletedOff, mdiPower } from '@mdi/js';
 import ServiceModel from '../../../models/Service';
-import { Icon } from '../../ui/icon';
+import Icon from '../../ui/icon';
 
 const messages = defineMessages({
   tooltipIsDisabled: {
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index a8fdea2fb..56d7b8905 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -31,7 +31,7 @@ import {
 } from '../../../environment-remote';
 import { openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
-import { Icon } from '../../ui/icon';
+import Icon from '../../ui/icon';
 import Slider from '../../ui/Slider';
 
 const debug = require('../../../preload-safe-debug')('Ferdium:EditSettingsForm');
diff --git a/src/components/settings/user/EditUserForm.js b/src/components/settings/user/EditUserForm.js
index fb9ef5c9a..436a6b76b 100644
--- a/src/components/settings/user/EditUserForm.js
+++ b/src/components/settings/user/EditUserForm.js
@@ -4,7 +4,7 @@ import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 
-import { Input } from '../../ui/input/index';
+import Input from '../../ui/input/index';
 import Form from '../../../lib/Form';
 import Button from '../../ui/button';
 import Radio from '../../ui/Radio';
diff --git a/src/components/ui/ImageUpload.tsx b/src/components/ui/ImageUpload.tsx
index c8a6cf54a..3a396f56c 100644
--- a/src/components/ui/ImageUpload.tsx
+++ b/src/components/ui/ImageUpload.tsx
@@ -5,7 +5,7 @@ import classnames from 'classnames';
 import Dropzone from 'react-dropzone';
 import { mdiDelete, mdiFileImage } from '@mdi/js';
 import { isWindows } from '../../environment';
-import { Icon } from './icon';
+import Icon from './icon';
 
 type Props = {
   field: typeof Field;
diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js
index e50e270bd..d73491da0 100644
--- a/src/components/ui/InfoBar.js
+++ b/src/components/ui/InfoBar.js
@@ -7,7 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { mdiClose } from '@mdi/js';
 import Appear from './effects/Appear';
-import { Icon } from './icon';
+import Icon from './icon';
 
 const messages = defineMessages({
   hide: {
diff --git a/src/components/ui/Infobox.js b/src/components/ui/Infobox.js
index e05d17742..8fb80d87f 100644
--- a/src/components/ui/Infobox.js
+++ b/src/components/ui/Infobox.js
@@ -5,7 +5,7 @@ import classnames from 'classnames';
 import Loader from 'react-loader';
 import { defineMessages, injectIntl } from 'react-intl';
 import { mdiAlert, mdiCheckboxMarkedCircleOutline, mdiClose } from '@mdi/js';
-import { Icon } from '../ui/icon';
+import Icon from '../ui/icon';
 
 const icons = {
   'checkbox-marked-circle-outline': mdiCheckboxMarkedCircleOutline,
diff --git a/src/components/ui/Input.js b/src/components/ui/Input.js
index 77bae8101..ae14493ca 100644
--- a/src/components/ui/Input.js
+++ b/src/components/ui/Input.js
@@ -7,7 +7,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 
 import { mdiEye, mdiEyeOff } from '@mdi/js';
 import { scorePassword as scorePasswordFunc } from '../../helpers/password-helpers';
-import { Icon } from './icon';
+import Icon from './icon';
 
 const messages = defineMessages({
   passwordToggle: {
diff --git a/src/components/ui/Modal/index.tsx b/src/components/ui/Modal/index.tsx
index c3c78b419..7407a686d 100644
--- a/src/components/ui/Modal/index.tsx
+++ b/src/components/ui/Modal/index.tsx
@@ -4,7 +4,7 @@ import classnames from 'classnames';
 import injectCSS from 'react-jss';
 import { mdiClose } from '@mdi/js';
 
-import { Icon } from '../icon';
+import Icon from '../icon';
 import styles from './styles';
 
 type Props = {
diff --git a/src/components/ui/SearchInput.tsx b/src/components/ui/SearchInput.tsx
index 67ca469f0..6a8c4de8f 100644
--- a/src/components/ui/SearchInput.tsx
+++ b/src/components/ui/SearchInput.tsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react';
 import classnames from 'classnames';
 import { debounce } from 'lodash';
 import { mdiCloseCircleOutline, mdiMagnify } from '@mdi/js';
-import { Icon } from './icon';
+import Icon from './icon';
 
 type Props = {
   value: string;
diff --git a/src/components/ui/Tabs/TabItem.tsx b/src/components/ui/Tabs/TabItem.tsx
index 9fcc3c41e..631586d62 100644
--- a/src/components/ui/Tabs/TabItem.tsx
+++ b/src/components/ui/Tabs/TabItem.tsx
@@ -1 +1 @@
-export const TabItem = ({ children }) => <>{children}</>;
+export default ({ children }) => <>{children}</>;
diff --git a/src/components/ui/badge/ProBadge.tsx b/src/components/ui/badge/ProBadge.tsx
index 410748a64..62c45b77c 100644
--- a/src/components/ui/badge/ProBadge.tsx
+++ b/src/components/ui/badge/ProBadge.tsx
@@ -4,8 +4,8 @@ import { Component } from 'react';
 import injectStyle, { WithStylesProps } from 'react-jss';
 
 import { Theme } from '../../../themes';
-import { Icon } from '../icon';
-import { Badge } from './index';
+import Icon from '../icon';
+import Badge from './index';
 
 interface IProps extends WithStylesProps<typeof styles> {
   badgeClasses?: string;
diff --git a/src/components/ui/badge/index.tsx b/src/components/ui/badge/index.tsx
index a7ed866a5..33e2f5d53 100644
--- a/src/components/ui/badge/index.tsx
+++ b/src/components/ui/badge/index.tsx
@@ -67,4 +67,4 @@ class BadgeComponent extends Component<IProps> {
   }
 }
 
-export const Badge = injectStyle(styles, { injectTheme: true })(BadgeComponent);
+export default injectStyle(styles, { injectTheme: true })(BadgeComponent);
diff --git a/src/components/ui/error/index.tsx b/src/components/ui/error/index.tsx
index ff3bc31c6..01fb5ca27 100644
--- a/src/components/ui/error/index.tsx
+++ b/src/components/ui/error/index.tsx
@@ -17,4 +17,4 @@ class ErrorComponent extends Component<IProps> {
   }
 }
 
-export const Error = injectSheet(styles, { injectTheme: true })(ErrorComponent);
+export default injectSheet(styles, { injectTheme: true })(ErrorComponent);
diff --git a/src/components/ui/icon/index.tsx b/src/components/ui/icon/index.tsx
index 52f61d2d7..7e13b98c7 100644
--- a/src/components/ui/icon/index.tsx
+++ b/src/components/ui/icon/index.tsx
@@ -42,4 +42,4 @@ class IconComponent extends Component<IProps> {
   }
 }
 
-export const Icon = injectStyle(styles, { injectTheme: true })(IconComponent);
+export default injectStyle(styles, { injectTheme: true })(IconComponent);
diff --git a/src/components/ui/infobox/index.tsx b/src/components/ui/infobox/index.tsx
index 9635941cc..91ef88747 100644
--- a/src/components/ui/infobox/index.tsx
+++ b/src/components/ui/infobox/index.tsx
@@ -4,7 +4,7 @@ import { Component, ReactNode } from 'react';
 import injectStyle, { WithStylesProps } from 'react-jss';
 
 import { Theme } from '../../../themes';
-import { Icon } from '../icon';
+import Icon from '../icon';
 
 interface IProps extends WithStylesProps<typeof styles> {
   icon?: string;
@@ -199,6 +199,6 @@ class InfoboxComponent extends Component<IProps, IState> {
   }
 }
 
-export const Infobox = injectStyle(styles, { injectTheme: true })(
+export default injectStyle(styles, { injectTheme: true })(
   InfoboxComponent,
 );
diff --git a/src/components/ui/input/index.tsx b/src/components/ui/input/index.tsx
index bfbee33b9..aa282cce0 100644
--- a/src/components/ui/input/index.tsx
+++ b/src/components/ui/input/index.tsx
@@ -6,9 +6,9 @@ import injectSheet, { WithStylesProps } from 'react-jss';
 
 import { IFormField } from '../typings/generic';
 
-import { Error } from '../error';
-import { Label } from '../label';
-import { Wrapper } from '../wrapper';
+import Error from '../error';
+import Label from '../label';
+import Wrapper from '../wrapper';
 import { scorePasswordFunc } from './scorePassword';
 
 import styles from './styles';
@@ -205,4 +205,4 @@ class InputComponent extends Component<IProps, IState> {
   }
 }
 
-export const Input = injectSheet(styles, { injectTheme: true })(InputComponent);
+export default injectSheet(styles, { injectTheme: true })(InputComponent);
diff --git a/src/components/ui/label/index.tsx b/src/components/ui/label/index.tsx
index dcc14bff4..5f5cc5c8e 100644
--- a/src/components/ui/label/index.tsx
+++ b/src/components/ui/label/index.tsx
@@ -50,4 +50,4 @@ class LabelComponent extends Component<ILabel> {
   }
 }
 
-export const Label = injectSheet(styles, { injectTheme: true })(LabelComponent);
+export default injectSheet(styles, { injectTheme: true })(LabelComponent);
diff --git a/src/components/ui/loader/index.tsx b/src/components/ui/loader/index.tsx
index d56995ccc..4d52f320e 100644
--- a/src/components/ui/loader/index.tsx
+++ b/src/components/ui/loader/index.tsx
@@ -41,6 +41,6 @@ class LoaderComponent extends Component<IProps> {
   }
 }
 
-export const Loader = injectStyle(styles, { injectTheme: true })(
+export default injectStyle(styles, { injectTheme: true })(
   LoaderComponent,
 );
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index ac509aa7c..c3b5314e3 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -11,9 +11,9 @@ import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
 import { IFormField } from '../typings/generic';
 
-import { Error } from '../error';
-import { Label } from '../label';
-import { Wrapper } from '../wrapper';
+import Error from '../error';
+import Label from '../label';
+import Wrapper from '../wrapper';
 
 interface IOptions {
   [index: string]: string;
diff --git a/src/components/ui/textarea/index.tsx b/src/components/ui/textarea/index.tsx
index 34ec4cf4b..e005767f8 100644
--- a/src/components/ui/textarea/index.tsx
+++ b/src/components/ui/textarea/index.tsx
@@ -4,9 +4,9 @@ import injectSheet, { WithStylesProps } from 'react-jss';
 
 import { IFormField } from '../typings/generic';
 
-import { Error } from '../error';
-import { Label } from '../label';
-import { Wrapper } from '../wrapper';
+import Error from '../error';
+import Label from '../label';
+import Wrapper from '../wrapper';
 
 import styles from './styles';
 
diff --git a/src/components/ui/toggle/index.tsx b/src/components/ui/toggle/index.tsx
index 856581a21..0629d1a2c 100644
--- a/src/components/ui/toggle/index.tsx
+++ b/src/components/ui/toggle/index.tsx
@@ -6,9 +6,9 @@ import injectStyle, { WithStylesProps } from 'react-jss';
 import { Theme } from '../../../themes';
 import { IFormField } from '../typings/generic';
 
-import { Error } from '../error';
-import { Label } from '../label';
-import { Wrapper } from '../wrapper';
+import Error from '../error';
+import Label from '../label';
+import Wrapper from '../wrapper';
 
 interface IProps
   extends InputHTMLAttributes<HTMLInputElement>,
@@ -122,6 +122,6 @@ class ToggleComponent extends Component<IProps> {
   }
 }
 
-export const Toggle = injectStyle(styles, { injectTheme: true })(
+export default injectStyle(styles, { injectTheme: true })(
   ToggleComponent,
 );
diff --git a/src/components/ui/wrapper/index.tsx b/src/components/ui/wrapper/index.tsx
index bc385d319..e7477a25c 100644
--- a/src/components/ui/wrapper/index.tsx
+++ b/src/components/ui/wrapper/index.tsx
@@ -33,6 +33,6 @@ class WrapperComponent extends Component<IProps> {
   }
 }
 
-export const Wrapper = injectStyle(styles, { injectTheme: true })(
+export default injectStyle(styles, { injectTheme: true })(
   WrapperComponent,
 );
diff --git a/src/features/publishDebugInfo/Component.js b/src/features/publishDebugInfo/Component.js
index c40f8559f..1668ea79a 100644
--- a/src/features/publishDebugInfo/Component.js
+++ b/src/features/publishDebugInfo/Component.js
@@ -8,7 +8,7 @@ import { state as ModalState } from './store';
 import { H1 } from '../../components/ui/headline';
 import { sendAuthRequest } from '../../api/utils/auth';
 import Button from '../../components/ui/button';
-import { Input } from '../../components/ui/input/index';
+import Input from '../../components/ui/input/index';
 import Modal from '../../components/ui/Modal';
 import { DEBUG_API } from '../../config';
 import AppStore from '../../stores/AppStore';
diff --git a/src/features/quickSwitch/Component.js b/src/features/quickSwitch/Component.js
index 9e66c444d..16da22dce 100644
--- a/src/features/quickSwitch/Component.js
+++ b/src/features/quickSwitch/Component.js
@@ -7,7 +7,7 @@ import injectSheet from 'react-jss';
 import { defineMessages, injectIntl } from 'react-intl';
 import { compact, invoke } from 'lodash';
 
-import { Input } from '../../components/ui/input/index';
+import Input from '../../components/ui/input/index';
 import { H1 } from '../../components/ui/headline';
 import Modal from '../../components/ui/Modal';
 import { state as ModalState } from './store';
diff --git a/src/features/webControls/components/WebControls.js b/src/features/webControls/components/WebControls.js
index 99d78eda0..570f2f2dc 100644
--- a/src/features/webControls/components/WebControls.js
+++ b/src/features/webControls/components/WebControls.js
@@ -12,7 +12,7 @@ import {
   mdiEarth,
 } from '@mdi/js';
 
-import { Icon } from '../../../components/ui/icon';
+import Icon from '../../../components/ui/icon';
 
 const messages = defineMessages({
   goHome: {
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index aebe740d0..fac84bed0 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -4,7 +4,7 @@ import { observer } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 
-import { Input } from '../../../components/ui/input/index';
+import Input from '../../../components/ui/input/index';
 import Button from '../../../components/ui/button';
 import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index 9baa80e98..3c7c36a3d 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -5,8 +5,8 @@ import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router';
 import injectSheet from 'react-jss';
 
-import { Infobox } from '../../../components/ui/infobox/index';
-import { Input } from '../../../components/ui/input/index';
+import Infobox from '../../../components/ui/infobox/index';
+import Input from '../../../components/ui/input/index';
 import Button from '../../../components/ui/button';
 import Workspace from '../models/Workspace';
 import Service from '../../../models/Service';
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 22e4fa9fa..d56945296 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -8,7 +8,7 @@ import ReactTooltip from 'react-tooltip';
 import { mdiPlusBox, mdiCog } from '@mdi/js';
 
 import { H1 } from '../../../components/ui/headline';
-import { Icon } from '../../../components/ui/icon';
+import Icon from '../../../components/ui/icon';
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
 import { workspaceStore } from '../index';
diff --git a/src/features/workspaces/components/WorkspaceServiceListItem.tsx b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
index 46fda0103..0233d5749 100644
--- a/src/features/workspaces/components/WorkspaceServiceListItem.tsx
+++ b/src/features/workspaces/components/WorkspaceServiceListItem.tsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react';
 import injectSheet from 'react-jss';
 import classnames from 'classnames';
 
-import { Toggle } from '../../../components/ui/toggle/index';
+import Toggle from '../../../components/ui/toggle/index';
 import ServiceIcon from '../../../components/ui/ServiceIcon';
 
 const styles = theme => ({
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
index b2e0adfe7..ff73758c1 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -5,7 +5,7 @@ import injectSheet from 'react-jss';
 import classnames from 'classnames';
 import { defineMessages, injectIntl } from 'react-intl';
 
-import { Loader } from '../../../components/ui/loader/index';
+import Loader from '../../../components/ui/loader/index';
 import { workspaceStore } from '../index';
 
 const messages = defineMessages({
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index f21aaa258..87ba06a2d 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -5,7 +5,7 @@ import { observer, PropTypes as MobxPropTypes, inject } from 'mobx-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import injectSheet from 'react-jss';
 
-import { Infobox } from '../../../components/ui/infobox/index';
+import Infobox from '../../../components/ui/infobox/index';
 import Loader from '../../../components/ui/Loader';
 import WorkspaceItem from './WorkspaceItem';
 import CreateWorkspaceForm from './CreateWorkspaceForm';