diff --git a/app/theme/client/imports/components/header.css b/app/theme/client/imports/components/header.css
index 7294aa84ad53..e0edd428cac7 100644
--- a/app/theme/client/imports/components/header.css
+++ b/app/theme/client/imports/components/header.css
@@ -2,8 +2,6 @@
 
 	z-index: 10;
 
-	padding: 0.5rem;
-
 	font-size: var(--text-heading-size);
 
 	.rc-badge {
@@ -61,8 +59,6 @@
 
 		height: 36px;
 
-		margin: 0 -0.5rem;
-
 		white-space: nowrap;
 
 		background-color: var(--header-background-color);
@@ -457,6 +453,9 @@
 
 		&--burger {
 			display: flex;
+
+			margin: 0;
+			padding: 0;
 		}
 	}
 }
@@ -524,6 +523,9 @@
 	.rc-header {
 		&--burger {
 			display: flex;
+
+			margin: 0;
+			padding: 0;
 		}
 	}
 }
diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 39e613655a16..8f66aade6be1 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -200,7 +200,7 @@
 	width: 100%;
 	height: 100%;
 
-	padding: 1.25rem 2rem;
+	padding: 1.25rem;
 
 	& .content {
 		display: flex;
@@ -208,8 +208,8 @@
 		flex-direction: column;
 		flex: 1 1 auto;
 
-		margin: 0 -2rem;
-		padding: 2rem 2rem 0;
+		margin: 0 -1.25rem;
+		padding: 1.25rem 1.25rem 0;
 
 		line-height: 1.3em;
 		-webkit-overflow-scrolling: touch;
@@ -4621,6 +4621,7 @@ rc-old select,
 		padding: 6px 8px;
 
 		text-align: left;
+		word-break: break-word;
 	}
 
 	& th {