diff --git a/src/components/common/ServerHeader.tsx b/src/components/common/ServerHeader.tsx
index 804f139d..a6a8ff1b 100644
--- a/src/components/common/ServerHeader.tsx
+++ b/src/components/common/ServerHeader.tsx
@@ -25,7 +25,48 @@ export default observer(({ server }: Props) => {
     const bannerURL = server.generateBannerURL({ width: 480 });
 
     return (
-        <Header
+        <div>
+            {server.flags && server.flags & 1 ? (
+                <Tooltip
+                    content={<Text id="app.special.server-badges.official" />}
+                    placement={"bottom-start"}>
+                    <svg width="20" height="20">
+                        <image
+                            xlinkHref="/assets/badges/verified.svg"
+                            height="20"
+                            width="20"
+                        />
+                        <image
+                            xlinkHref="/assets/badges/revolt_r.svg"
+                            height="15"
+                            width="15"
+                            x="2"
+                            y="3"
+                            style={
+                                "justify-content: center; align-items: center; filter: brightness(0);"
+                            }
+                        />
+                    </svg>
+                </Tooltip>
+            ) : undefined}
+            {server.flags && server.flags & 2 ? (
+                <Tooltip
+                    content={<Text id="app.special.server-badges.verified" />}
+                    placement={"bottom-start"}>
+                    <svg width="20" height="20">
+                        <image
+                            xlinkHref="/assets/badges/verified.svg"
+                            height="20"
+                            width="20"
+                        />
+                        <foreignObject x="2" y="2" width="15" height="15">
+                            <Check size={15} color="black" strokeWidth={8} />
+                        </foreignObject>
+                    </svg>
+                </Tooltip>
+            ) : undefined}
+        </div>
+        /*<Header
             borders
             placement="secondary"
             background={typeof bannerURL !== "undefined"}
@@ -82,6 +123,6 @@ export default observer(({ server }: Props) => {
                     </Link>
                 </div>
             )}
-        </Header>
+            </Header>*/
     );
 });
diff --git a/src/components/navigation/SidebarBase.tsx b/src/components/navigation/SidebarBase.tsx
index d724a356..39b37213 100644
--- a/src/components/navigation/SidebarBase.tsx
+++ b/src/components/navigation/SidebarBase.tsx
@@ -9,11 +9,11 @@ export default styled.div`
     flex-direction: row;
     align-items: stretch;
 
-    > * > ::-webkit-scrollbar-thumb {
+    /*> * > ::-webkit-scrollbar-thumb {
         width: 4px;
         background-clip: content-box;
         border-top: 48px solid transparent;
-    }
+    }*/
 `;
 
 export const GenericSidebarBase = styled.div<{
@@ -28,7 +28,12 @@ export const GenericSidebarBase = styled.div<{
     background: var(--secondary-background);
 
     > :nth-child(1) {
-        border-end-start-radius: 8px;
+        //border-end-start-radius: 8px;
+        margin-top: 48px;
+    }
+
+    > :nth-child(2) {
+        background: red;
     }
 
     ${(props) =>
diff --git a/src/components/navigation/left/ServerListSidebar.tsx b/src/components/navigation/left/ServerListSidebar.tsx
index 6b531ef9..84487cd2 100644
--- a/src/components/navigation/left/ServerListSidebar.tsx
+++ b/src/components/navigation/left/ServerListSidebar.tsx
@@ -168,6 +168,7 @@ const ServerCircle = styled.div`
     display: flex;
     align-items: center;
     justify-content: center;
+    flex-shrink: 0;
 
     .circle {
         display: flex;