diff --git a/packages/web/src/appobj/AppObjectCore.svelte b/packages/web/src/appobj/AppObjectCore.svelte
index 7370635ae..0850a0004 100644
--- a/packages/web/src/appobj/AppObjectCore.svelte
+++ b/packages/web/src/appobj/AppObjectCore.svelte
@@ -20,6 +20,7 @@
   export let expandIcon = undefined;
   export let checkedObjectsStore = null;
   export let disableContextMenu = false;
+  export let colorMark = null;
 
   $: isChecked = checkedObjectsStore && $checkedObjectsStore.find(x => module.extractKey(data) == module.extractKey(x));
 
@@ -86,6 +87,9 @@
   {:else}
     <FontIcon {icon} />
   {/if}
+  {#if colorMark}
+    <FontIcon style={`color:${colorMark}`} icon="icon square" />
+  {/if}
   {title}
   {#if statusIcon}
     <span class="status">
diff --git a/packages/web/src/appobj/AppObjectGroup.svelte b/packages/web/src/appobj/AppObjectGroup.svelte
index b8fdd6253..09d4ca740 100644
--- a/packages/web/src/appobj/AppObjectGroup.svelte
+++ b/packages/web/src/appobj/AppObjectGroup.svelte
@@ -13,6 +13,7 @@
   export let module;
   export let checkedObjectsStore = null;
   export let disableContextMenu = false;
+  export let passProps;
 
   let isExpanded = true;
 
@@ -61,6 +62,7 @@
       {checkedObjectsStore}
       on:objectClick
       {disableContextMenu}
+      {passProps}
     />
   {/each}
 {/if}
diff --git a/packages/web/src/appobj/AppObjectList.svelte b/packages/web/src/appobj/AppObjectList.svelte
index d2d100101..ed5477b3c 100644
--- a/packages/web/src/appobj/AppObjectList.svelte
+++ b/packages/web/src/appobj/AppObjectList.svelte
@@ -14,6 +14,7 @@
   export let expandIconFunc = undefined;
   export let checkedObjectsStore = null;
   export let disableContextMenu = false;
+  export let passProps;
 
   export let groupFunc = undefined;
 
@@ -75,6 +76,7 @@
       {groupFunc}
       {disableContextMenu}
       {filter}
+      {passProps}
     />
   {/each}
 {:else}
@@ -92,6 +94,7 @@
       {disableContextMenu}
       {filter}
       isExpandedBySearch={childrenMatched.includes(data)}
+      {passProps}
     />
   {/each}
 {/if}
diff --git a/packages/web/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
index 3f1623138..f61003985 100644
--- a/packages/web/src/appobj/AppObjectListItem.svelte
+++ b/packages/web/src/appobj/AppObjectListItem.svelte
@@ -21,6 +21,7 @@
   export let checkedObjectsStore = null;
   export let disableContextMenu = false;
   export let isExpandedBySearch = false;
+  export let passProps;
 
   let isExpanded = false;
 
@@ -50,6 +51,7 @@
     {checkedObjectsStore}
     {module}
     {disableContextMenu}
+    {passProps}
   />
 
   {#if (isExpanded || isExpandedBySearch) && subItemsComponent}
diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
index 1c5daac5e..fe7c951e5 100644
--- a/packages/web/src/appobj/ConnectionAppObject.svelte
+++ b/packages/web/src/appobj/ConnectionAppObject.svelte
@@ -31,6 +31,7 @@
   import { getLocalStorage } from '../utility/storageCache';
 
   export let data;
+  export let passProps;
 
   let statusIcon = null;
   let statusTitle = null;
@@ -198,6 +199,7 @@
   statusIcon={statusIcon || engineStatusIcon}
   statusTitle={statusTitle || engineStatusTitle}
   {extInfo}
+  colorMark={passProps?.connectionColorFactory({ conid: data._id })}
   menu={getContextMenu}
   on:click={handleConnect}
   on:click
diff --git a/packages/web/src/icons/FontIcon.svelte b/packages/web/src/icons/FontIcon.svelte
index 9b6755248..9a265bcc5 100644
--- a/packages/web/src/icons/FontIcon.svelte
+++ b/packages/web/src/icons/FontIcon.svelte
@@ -3,6 +3,7 @@
   export let title = null;
   export let padLeft = false;
   export let padRight = false;
+  export let style = null;
 
   const iconNames = {
     'icon minus-box': 'mdi mdi-minus-box-outline',
@@ -47,6 +48,7 @@
     'icon form': 'mdi mdi-form-select',
     'icon history': 'mdi mdi-history',
     'icon structure': 'mdi mdi-tools',
+    'icon square': 'mdi mdi-square',
 
     'icon edit': 'mdi mdi-pencil',
     'icon delete': 'mdi mdi-delete',
@@ -145,7 +147,7 @@
   };
 </script>
 
-<span class={iconNames[icon] || icon} {title} class:padLeft class:padRight on:click />
+<span class={iconNames[icon] || icon} {title} class:padLeft class:padRight {style} on:click />
 
 <style>
   .padLeft {
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index 9bc676e97..555db00f7 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -13,6 +13,7 @@
   import ToolbarButton from './ToolbarButton.svelte';
   import runCommand from '../commands/runCommand';
   import getConnectionLabel from '../utility/getConnectionLabel';
+  import { useConnectionColorFactory } from '../utility/useConnectionColor';
 
   const connections = useConnectionList();
   const serverStatus = useServerStatus();
@@ -29,6 +30,8 @@
       axiosInstance.post('server-connections/refresh', { conid });
     }
   };
+
+  const connectionColorFactory = useConnectionColorFactory(3);
 </script>
 
 <SearchBoxWrapper>
@@ -43,6 +46,7 @@
     expandOnClick
     isExpandable={data => $openedConnections.includes(data._id) && !data.singleDatabase}
     {filter}
+    passProps={{ connectionColorFactory: $connectionColorFactory }}
   />
   {#if $connections && $connections.length == 0 && $commandsCustomized['new.connection']?.enabled}
     <ToolbarButton icon="icon new-connection" on:click={() => runCommand('new.connection')}>