diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
index a6c1c08786d6..85578a4c080b 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css
@@ -14,9 +14,9 @@
 .sidebar__account {
 	display: flex;
 
-	margin: 0 0 var(--sidebar-header-small-padding);
+	margin: 0 0 var(--sidebar-extra-small-default-padding);
 
-	padding: var(--sidebar-header-small-padding) var(--sidebar-default-padding) var(--sidebar-header-small-padding);
+	padding: var(--sidebar-extra-small-default-padding) var(--sidebar-default-padding);
 
 	align-items: center;
 
diff --git a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
index f0e368af8cd4..33fb8fec937b 100644
--- a/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
+++ b/packages/rocketchat-theme/client/imports/components/sidebar/sidebar.css
@@ -49,7 +49,7 @@
 	&__footer {
 		width: auto;
 		height: var(--sidebar-footer-height);
-		padding: calc(var(--sidebar-footer-padding) / 2) var(--sidebar-footer-padding);
+		padding: var(--sidebar-extra-small-default-padding) var(--sidebar-default-padding);
 
 		text-align: center;
 
diff --git a/packages/rocketchat-theme/client/imports/general/variables.css b/packages/rocketchat-theme/client/imports/general/variables.css
index f6be0ab3088d..07a9282c0dc6 100644
--- a/packages/rocketchat-theme/client/imports/general/variables.css
+++ b/packages/rocketchat-theme/client/imports/general/variables.css
@@ -144,10 +144,8 @@
 		--sidebar-background-light-hover: var(--rc-color-primary-light);
 		--sidebar-default-padding: 24px;
 		--sidebar-small-default-padding: 16px;
-		--sidebar-header-padding: 16px;
-		--sidebar-header-small-padding: 12px;
+		--sidebar-extra-small-default-padding: 12px;
 		--sidebar-footer-height: 70px;
-		--sidebar-footer-padding: var(--sidebar-header-padding);
 		--sidebar-small-header-padding: var(--sidebar-small-default-padding);
 
 		/*