diff --git a/frappe/public/scss/website/base.scss b/frappe/public/scss/website/base.scss
index abb2cec4dc..90453fc9db 100644
--- a/frappe/public/scss/website/base.scss
+++ b/frappe/public/scss/website/base.scss
@@ -1,13 +1,3 @@
-$font-size-xs: 0.7rem;
-$font-size-sm: 0.85rem;
-$font-size-lg: 1.12rem;
-$font-size-xl: 1.2rem;
-$font-size-2xl: 1.4rem;
-$font-size-3xl: 1.9rem;
-$font-size-4xl: 2.4rem;
-$font-size-5xl: 3rem;
-$font-size-6xl: 4rem;
-
 html {
 	height: 100%;
 }
@@ -29,66 +19,66 @@ h1, h2, h3, h4 {
 }
 
 h1 {
-	font-size: $font-size-3xl;
+	font-size: 2rem;
 	line-height: 1.25;
 	letter-spacing: -0.025em;
 	margin-top: 3rem;
 	margin-bottom: 0.75rem;
 
 	@include media-breakpoint-up(sm) {
-		font-size: $font-size-5xl;
+		font-size: 2.5rem;
 		margin-top: 3.5rem;
 		margin-bottom: 1.25rem;
 	}
 	@include media-breakpoint-up(xl) {
-		font-size: $font-size-6xl;
+		font-size: 3.5rem;
 		line-height: 1;
 		margin-top: 4rem;
 	}
 }
 
 h2 {
-	font-size: $font-size-2xl;
+	font-size: 1.4rem;
 	margin-top: 2rem;
 	margin-bottom: 0.5rem;
 
 	@include media-breakpoint-up(sm) {
-		font-size: $font-size-3xl;
+		font-size: 2rem;
 		margin-top: 4rem;
 		margin-bottom: 0.75rem;
 	}
 	@include media-breakpoint-up(xl) {
-		font-size: $font-size-4xl;
+		font-size: 2.5rem;
 		margin-top: 4rem;
 	}
 }
 
 h3 {
-	font-size: $font-size-xl;
+	font-size: 1.2rem;
 	margin-top: 1.5rem;
 	margin-bottom: 0.5rem;
 
 	@include media-breakpoint-up(sm) {
-		font-size: $font-size-2xl;
+		font-size: 1.4rem;
 		margin-top: 2.5rem;
 	}
 	@include media-breakpoint-up(xl) {
-		font-size: $font-size-3xl;
+		font-size: 1.9rem;
 		margin-top: 3.5rem;
 	}
 }
 
 h4 {
-	font-size: $font-size-lg;
+	font-size: 1.1rem;
 	margin-top: 1rem;
 	margin-bottom: 0.5rem;
 
 	@include media-breakpoint-up(sm) {
-		font-size: $font-size-xl;
+		font-size: 1.3rem;
 		margin-top: 1.25rem;
 	}
 	@include media-breakpoint-up(xl) {
-		font-size: $font-size-2xl;
+		font-size: 1.5rem;
 		margin-top: 1.75rem;
 	}
 
@@ -98,5 +88,5 @@ h4 {
 }
 
 .btn.btn-lg {
-	font-size: $font-size-lg;
+	font-size: 1.1rem;
 }
diff --git a/frappe/public/scss/website/blog.scss b/frappe/public/scss/website/blog.scss
index a6f06df112..b16e088f69 100644
--- a/frappe/public/scss/website/blog.scss
+++ b/frappe/public/scss/website/blog.scss
@@ -102,6 +102,11 @@
 		}
 	}
 
+	.blog-comments {
+		margin-top: 1rem;
+		margin-bottom: 5rem;
+	}
+
 
 	.feedback-item svg {
 		vertical-align: sub;
diff --git a/frappe/public/scss/website/error-state.scss b/frappe/public/scss/website/error-state.scss
index c869e9e1df..7a83fc0084 100644
--- a/frappe/public/scss/website/error-state.scss
+++ b/frappe/public/scss/website/error-state.scss
@@ -1,4 +1,5 @@
 .error-page {
+	margin: 3rem 0;
 	text-align: center;
 
 	.img-404 {
diff --git a/frappe/public/scss/website/footer.scss b/frappe/public/scss/website/footer.scss
index 3a15fa2017..9a36d7ab6d 100644
--- a/frappe/public/scss/website/footer.scss
+++ b/frappe/public/scss/website/footer.scss
@@ -1,6 +1,5 @@
 .web-footer {
 	padding: 3rem 0;
-	margin-top: 4rem;
 	min-height: 140px;
 	background-color: var(--fg-color);
 	border-top: 1px solid $border-color;
diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html
index d8ece09f46..4bab50c33e 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post.html
@@ -66,7 +66,7 @@
 	{% endif %}
 
 	{% if not disable_comments %}
-		<div class="my-5 blog-comments">
+		<div class="blog-comments">
 			{% include 'templates/includes/comments/comments.html' %}
 		</div>
 	{% endif %}
diff --git a/frappe/website/doctype/blog_post/templates/blog_post_list.html b/frappe/website/doctype/blog_post/templates/blog_post_list.html
index 1aa30316fe..4cb53d065c 100644
--- a/frappe/website/doctype/blog_post/templates/blog_post_list.html
+++ b/frappe/website/doctype/blog_post/templates/blog_post_list.html
@@ -8,8 +8,8 @@
 	<div class="col-md-8">
 		<div class="hero">
 			<div class="hero-content">
-				<h1 class="hero-title">{{ blog_title or _('Blog') }}</h1>
-				<p class="hero-subtitle mb-0">{{ blog_introduction or '' }}</p>
+				<h1>{{ blog_title or _('Blog') }}</h1>
+				<p>{{ blog_introduction or '' }}</p>
 			</div>
 		</div>
 	</div>