diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css
index 8a4ce0ee0a..8438f66720 100644
--- a/Themes/BasicBackground/BasicBackground.css
+++ b/Themes/BasicBackground/BasicBackground.css
@@ -365,17 +365,16 @@ body::before {
 	border-radius: 15px 15px 24px 24px;
 	top: 0;
 	bottom: 0;
+	margin-bottom: 8px;
 	transition: border-radius 3s ease, background-color 1s ease;
 }
 .expandedFolderBackground-2sPsd-.hover-2ji_A7 {
 	background-color: rgba(var(--vtransparencycolor), 0.4);
 }
 
-.wrapper-1Rf91z .wrapper-21YSNc .expandedGuilds-1JMD4M,
 .wrapper-1Rf91z .wrapper-21YSNc [role="group"] {			/* folder				guildwrap							*/
-	height: auto !important;
+	margin-bottom: -8px;
 }
-.wrapper-1Rf91z .wrapper-21YSNc .expandedGuilds-1JMD4M .listItem-2P_4kh:last-child,
 .wrapper-1Rf91z .wrapper-21YSNc [role="group"] .listItem-2P_4kh:last-child {
 	margin-bottom: 0;
 }
diff --git a/Themes/ServerColumns/ServerColumns.css b/Themes/ServerColumns/ServerColumns.css
index 863022e753..0b033cf2d3 100644
--- a/Themes/ServerColumns/ServerColumns.css
+++ b/Themes/ServerColumns/ServerColumns.css
@@ -187,18 +187,15 @@ body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
 .wrapper-1Rf91z .wrapper-21YSNc > .listItem-2P_4kh {
 	margin: 0 !important;
 }
-.wrapper-1Rf91z .wrapper-21YSNc .expandedGuilds-1JMD4M,
 .wrapper-1Rf91z .wrapper-21YSNc [role="group"] {
 	overflow: visible !important;
 	margin-left: -1px !important;
+	margin-bottom: -8px !important;
 	padding-left: 1px !important;
-	height: auto !important;
 }
-.wrapper-1Rf91z .wrapper-21YSNc .expandedGuilds-1JMD4M .listItem-2P_4kh,
 .wrapper-1Rf91z .wrapper-21YSNc [role="group"] .listItem-2P_4kh {
 	margin: 6px 0 !important;
 }
-.wrapper-1Rf91z .wrapper-21YSNc .expandedGuilds-1JMD4M .listItem-2P_4kh:last-child,
 .wrapper-1Rf91z .wrapper-21YSNc [role="group"] .listItem-2P_4kh:last-child {
 	margin-bottom: 0 !important;
 }
@@ -207,6 +204,7 @@ body.foldercontentopened .titleBar-AC4pGV.typeMacOS-3EmCyP .macButtons-2MuSAC {
 	top: 0 !important;
 	bottom: 0 !important;
 	left: 0 !important;
+	margin-bottom: 8px !important;
 }
 
 html .typingindicator-guild,