diff --git a/packages/react-identicon/src/Identicon.tsx b/packages/react-identicon/src/Identicon.tsx
index 57ad9a92..46d555a7 100644
--- a/packages/react-identicon/src/Identicon.tsx
+++ b/packages/react-identicon/src/Identicon.tsx
@@ -8,7 +8,7 @@ import { IdentityProps as Props, Props as ComponentProps } from './types';
 import React from 'react';
 import CopyToClipboard from 'react-copy-to-clipboard';
 import styled from 'styled-components';
-import settings, { ICON_DEFAULT } from '@polkadot/ui-settings';
+import settings, { ICON_DEFAULT_HOST } from '@polkadot/ui-settings';
 import { isHex, isU8a, u8aToHex } from '@polkadot/util';
 import { decodeAddress, encodeAddress } from '@polkadot/util-crypto';
 
@@ -113,7 +113,7 @@ export default class IdentityIcon extends React.PureComponent<Props, State> {
     const { className, isHighlight = false, size = DEFAULT_SIZE, style, theme = settings.icon } = this.props;
     const Component = !address
       ? Empty
-      : Components[theme === 'default' ? ICON_DEFAULT : theme] || Fallback;
+      : Components[theme === 'default' ? ICON_DEFAULT_HOST : theme] || Fallback;
 
     return (
       <Wrapper
diff --git a/packages/ui-settings/src/defaults/index.ts b/packages/ui-settings/src/defaults/index.ts
index 18119814..b33a6b65 100644
--- a/packages/ui-settings/src/defaults/index.ts
+++ b/packages/ui-settings/src/defaults/index.ts
@@ -7,7 +7,7 @@ import { Option } from '../types';
 import { CRYPTOS } from './crypto';
 import { ENDPOINTS, ENDPOINT_DEFAULT } from './endpoints';
 import { PREFIXES, PREFIX_DEFAULT } from './ss58';
-import { ICON_DEFAULT, ICONS, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './ui';
+import { ICON_DEFAULT, ICON_DEFAULT_HOST, ICONS, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './ui';
 
 const LANGUAGE_DEFAULT = 'default';
 
@@ -39,6 +39,7 @@ export {
   ENDPOINT_DEFAULT,
   ENDPOINTS,
   ICON_DEFAULT,
+  ICON_DEFAULT_HOST,
   ICONS,
   LANGUAGE_DEFAULT,
   LANGUAGES,
diff --git a/packages/ui-settings/src/defaults/ui.ts b/packages/ui-settings/src/defaults/ui.ts
index 2d93efc1..0f4fa322 100644
--- a/packages/ui-settings/src/defaults/ui.ts
+++ b/packages/ui-settings/src/defaults/ui.ts
@@ -42,7 +42,9 @@ const UITHEMES: Option[] = [
   }
 ];
 
-const ICON_DEFAULT = isPolkadot
+const ICON_DEFAULT = 'default';
+
+const ICON_DEFAULT_HOST = isPolkadot
   ? 'polkadot'
   : 'substrate';
 
@@ -50,7 +52,7 @@ const ICONS: Option[] = [
   {
     info: 'default',
     text: 'Default for the connected node',
-    value: -1
+    value: 'default'
   },
   {
     info: 'polkadot',
@@ -71,6 +73,7 @@ const ICONS: Option[] = [
 
 export {
   ICON_DEFAULT,
+  ICON_DEFAULT_HOST,
   ICONS,
   LANGUAGE_DEFAULT,
   UIMODE_DEFAULT,
diff --git a/packages/ui-settings/src/index.ts b/packages/ui-settings/src/index.ts
index f4bbd024..f13f5c76 100644
--- a/packages/ui-settings/src/index.ts
+++ b/packages/ui-settings/src/index.ts
@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import settings, { Settings } from './Settings';
-export { ENDPOINT_DEFAULT, ICON_DEFAULT, LANGUAGE_DEFAULT, LOCKING_DEFAULT, PREFIX_DEFAULT, UIMODE_DEFAULT, UITHEME_DEFAULT } from './defaults';
+export { ENDPOINT_DEFAULT, ICON_DEFAULT, ICON_DEFAULT_HOST, LANGUAGE_DEFAULT, LOCKING_DEFAULT, PREFIX_DEFAULT, UIMODE_DEFAULT, UITHEME_DEFAULT } from './defaults';
 
 export default settings;