diff --git a/frontend/src/app/main/ui/components/org_avatar.scss b/frontend/src/app/main/ui/components/org_avatar.scss
index b72591568b..4e9367c13c 100644
--- a/frontend/src/app/main/ui/components/org_avatar.scss
+++ b/frontend/src/app/main/ui/components/org_avatar.scss
@@ -6,10 +6,10 @@
 
 @use "ds/typography.scss" as t;
 @use "ds/colors.scss" as *;
+@use "ds/_utils.scss" as *;
 
 .org-avatar {
   position: relative;
-  border-radius: 50%;
   overflow: hidden;
   flex-shrink: 0;
 }
@@ -19,18 +19,21 @@
 }
 
 .org-avatar-xxxl {
-  width: var(--sp-xxxl);
-  height: var(--sp-xxxl);
+  width: px2rem(30);
+  height: px2rem(30);
+  border-radius: px2rem(6);
 }
 
 .org-avatar-xxl {
   width: var(--sp-xxl);
   height: var(--sp-xxl);
+  border-radius: px2rem(5);
 }
 
 .org-avatar-xl {
-  width: var(--sp-xl);
-  height: var(--sp-xl);
+  width: px2rem(22);
+  height: px2rem(22);
+  border-radius: var(--sp-xs);
 }
 
 .org-avatar-bg {
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.scss b/frontend/src/app/main/ui/dashboard/sidebar.scss
index 92edbbe3d5..7f0a8b983a 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.scss
+++ b/frontend/src/app/main/ui/dashboard/sidebar.scss
@@ -191,7 +191,7 @@
   @extend %menu-item-base;
 
   display: grid;
-  grid-template-columns: var(--sp-xxxl) 1fr auto;
+  grid-template-columns: auto 1fr auto;
   gap: var(--sp-s);
   height: $sz-40;
 }
@@ -603,7 +603,7 @@
   height: calc(2 * var(--sp-xxxl));
   max-height: calc(2 * var(--sp-xxxl));
   justify-content: space-between;
-  padding: 0 var(--sp-xl);
+  padding: 0 var(--sp-l);
 }
 
 .selected-org {
@@ -690,6 +690,7 @@
   grid-template-columns: 1fr auto auto;
   gap: var(--sp-s);
   height: 100%;
+  padding: 0 px2rem(10);
   width: 100%;
 }