diff --git a/grafana-plugin/src/containers/UsersTimezones/ColorfulUserCircle.module.scss b/grafana-plugin/src/components/ScheduleBorderedAvatar/ScheduleBorderedAvatar.module.scss
similarity index 100%
rename from grafana-plugin/src/containers/UsersTimezones/ColorfulUserCircle.module.scss
rename to grafana-plugin/src/components/ScheduleBorderedAvatar/ScheduleBorderedAvatar.module.scss
diff --git a/grafana-plugin/src/containers/UsersTimezones/ColorfulUserCircle.tsx b/grafana-plugin/src/components/ScheduleBorderedAvatar/ScheduleBorderedAvatar.tsx
similarity index 83%
rename from grafana-plugin/src/containers/UsersTimezones/ColorfulUserCircle.tsx
rename to grafana-plugin/src/components/ScheduleBorderedAvatar/ScheduleBorderedAvatar.tsx
index c0b733d6..bc6e568b 100644
--- a/grafana-plugin/src/containers/UsersTimezones/ColorfulUserCircle.tsx
+++ b/grafana-plugin/src/components/ScheduleBorderedAvatar/ScheduleBorderedAvatar.tsx
@@ -2,11 +2,11 @@ import React from 'react';
 
 import cn from 'classnames/bind';
 
-import styles from './ColorfulUserCircle.module.scss';
+import styles from './ScheduleBorderedAvatar.module.scss';
 
 const cx = cn.bind(styles);
 
-export default function ColorfulUserCircle({
+export default function ScheduleBorderedAvatar({
   colors,
   renderAvatar,
   renderIcon,
@@ -34,7 +34,7 @@ export default function ColorfulUserCircle({
     return (
       <>
         <svg xmlns="http://www.w3.org/2000/svg" version="1.1" width={width} height={height} viewBox="-10 -10 220 220">
-          <g fill="none" strokeWidth="20" transform="translate(100,100)">
+          <g fill="none" strokeWidth="35" transform="translate(100,100)">
             {renderColorPaths(colors)}
           </g>
         </svg>
@@ -45,7 +45,9 @@ export default function ColorfulUserCircle({
 
   function renderColorPaths(colors: string[]) {
     const colorSchemeList = colors;
-    if (colors.length === 1) {colorSchemeList.push(colors[0]);}
+    if (colors.length === 1) { // minimum is 2 arcs to round the circle
+      colorSchemeList.push(colors[0]);
+    }
 
     const stepAngle = (2 * Math.PI) / colors.length;
     const radius = 100;
diff --git a/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx b/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx
index e488ba46..0367f5fb 100644
--- a/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx
+++ b/grafana-plugin/src/containers/UsersTimezones/UsersTimezones.tsx
@@ -7,6 +7,7 @@ import { toJS } from 'mobx';
 import moment from 'moment';
 
 import Avatar from 'components/Avatar/Avatar';
+import ScheduleBorderedAvatar from 'components/ScheduleBorderedAvatar/ScheduleBorderedAvatar';
 import ScheduleUserDetails from 'components/ScheduleUserDetails/ScheduleUserDetails';
 import Text from 'components/Text/Text';
 import { findColor } from 'containers/Rotations/Rotations.helpers';
@@ -19,8 +20,6 @@ import { getStartOfWeek } from 'pages/schedule/Schedule.helpers';
 import { RootStore } from 'state';
 import { useStore } from 'state/useStore';
 
-import ColorfulUserCircle from './ColorfulUserCircle';
-
 import styles from './UsersTimezones.module.css';
 
 interface UsersTimezonesProps {
@@ -281,13 +280,13 @@ const AvatarGroup = (props: AvatarGroupProps) => {
               }}
               onClick={getAvatarClickHandler(user.timezone)}
             >
-              <ColorfulUserCircle
+              <ScheduleBorderedAvatar
                 colors={colorSchemeList}
                 width={32}
                 height={32}
                 renderAvatar={() => <Avatar src={user.avatar} size="large" />}
                 renderIcon={() => (isOncall ? <IsOncallIcon className={cx('is-oncall-icon')} /> : null)}
-              ></ColorfulUserCircle>
+              ></ScheduleBorderedAvatar>
             </div>
           </Tooltip>
         );