diff --git a/assets/scss/editor.scss b/assets/scss/editor.scss
index ac90454..c0714db 100644
--- a/assets/scss/editor.scss
+++ b/assets/scss/editor.scss
@@ -6,27 +6,15 @@
 
 	&.elementor-nerd-box {
 
-		.elementor-nerd-box-icon {
-			margin: 0;
+		.elementor-nerd-box-title {
+			margin-block-start: 24px;
 		}
 
 		.elementor-nerd-box-message {
-
-			.elementor-nerd-box-title {
-				margin: 0;
-				margin-block-start: 24px;
-				font-size: 16px;
-			}
-
-			.elementor-nerd-box-message {
-				margin: 0;
-				margin-block-start: 12px;
-				font-size: 11px;
-			}
+			margin-block-start: 12px;
 		}
 
 		.elementor-nerd-box-link {
-			margin: 0;
 			margin-block-start: 24px;
 		}
 	}
diff --git a/includes/settings/settings-footer.php b/includes/settings/settings-footer.php
index 4495648..9e818e2 100644
--- a/includes/settings/settings-footer.php
+++ b/includes/settings/settings-footer.php
@@ -499,38 +499,31 @@ class Settings_Footer extends Tab_Base {
 	}
 
 	public function get_additional_tab_content() {
+		$content_template = '
+			<div class="hello-elementor elementor-nerd-box">
+				<img src="%1$s" class="elementor-nerd-box-icon">
+				<p class="elementor-nerd-box-title">%2$s</p>
+				<p class="elementor-nerd-box-message">%3$s</p>
+				<a class="elementor-nerd-box-link elementor-button" target="_blank" href="%4$s">%5$s</a>
+			</div>';
+
 		if ( ! defined( 'ELEMENTOR_PRO_VERSION' ) ) {
-			return sprintf( '
-				<div class="hello-elementor elementor-nerd-box">
-					<img src="%4$s" class="elementor-nerd-box-icon">
-					<div class="elementor-nerd-box-message">
-						<p class="elementor-panel-heading-title elementor-nerd-box-title">%1$s</p>
-						<p>%2$s</p>
-					</div>
-					<a class="elementor-button go-pro" target="_blank" href="https://go.elementor.com/hello-theme-footer/">%3$s</a>
-				</div>
-				',
+			return sprintf(
+				$content_template,
+				get_template_directory_uri() . '/assets/images/go-pro.svg',
 				esc_html__( 'Create a custom footer with multiple options', 'hello-elementor' ),
 				esc_html__( 'Upgrade to Elementor Pro and enjoy free design and many more features', 'hello-elementor' ),
-				esc_html__( 'Upgrade', 'hello-elementor' ),
-				get_template_directory_uri() . '/assets/images/go-pro.svg'
+				'https://go.elementor.com/hello-theme-footer/',
+				esc_html__( 'Upgrade', 'hello-elementor' )
 			);
 		} else {
-			return sprintf( '
-				<div class="hello-elementor elementor-nerd-box">
-					<img src="%4$s" class="elementor-nerd-box-icon">
-					<div class="elementor-nerd-box-message">
-						<p class="elementor-panel-heading-title elementor-nerd-box-title">%1$s</p>
-						<p class="elementor-nerd-box-message">%2$s</p>
-					</div>
-					<a class="elementor-button e-primary" target="_blank" href="%5$s">%3$s</a>
-				</div>
-				',
-				esc_html__( 'Create a custom footer with the new Theme Builder', 'hello-elementor' ),
-				esc_html__( 'With the new Theme Builder you can jump directly into each part of your site', 'hello-elementor' ),
-				esc_html__( 'Create Footer', 'hello-elementor' ),
+			return sprintf(
+				$content_template,
 				get_template_directory_uri() . '/assets/images/go-pro.svg',
-				get_admin_url( null, 'admin.php?page=elementor-app#/site-editor/templates/footer' )
+				esc_html__( 'Create a custom footer with the Theme Builder', 'hello-elementor' ),
+				esc_html__( 'With the Theme Builder you can jump directly into each part of your site', 'hello-elementor' ),
+				get_admin_url( null, 'admin.php?page=elementor-app#/site-editor/templates/footer' ),
+				esc_html__( 'Create Footer', 'hello-elementor' )
 			);
 		}
 	}
diff --git a/includes/settings/settings-header.php b/includes/settings/settings-header.php
index fad7acc..d02d287 100644
--- a/includes/settings/settings-header.php
+++ b/includes/settings/settings-header.php
@@ -521,38 +521,31 @@ class Settings_Header extends Tab_Base {
 	}
 
 	public function get_additional_tab_content() {
+		$content_template = '
+			<div class="hello-elementor elementor-nerd-box">
+				<img src="%1$s" class="elementor-nerd-box-icon">
+				<p class="elementor-nerd-box-title">%2$s</p>
+				<p class="elementor-nerd-box-message">%3$s</p>
+				<a class="elementor-nerd-box-link elementor-button" target="_blank" href="%4$s">%5$s</a>
+			</div>';
+
 		if ( ! defined( 'ELEMENTOR_PRO_VERSION' ) ) {
-			return sprintf( '
-				<div class="hello-elementor elementor-nerd-box">
-					<img src="%4$s" class="elementor-nerd-box-icon">
-					<div class="elementor-nerd-box-message">
-						<p class="elementor-panel-heading-title elementor-nerd-box-title">%1$s</p>
-						<p>%2$s</p>
-					</div>
-					<a class="elementor-button go-pro" target="_blank" href="https://go.elementor.com/hello-theme-header/">%3$s</a>
-				</div>
-				',
+			return sprintf(
+				$content_template,
+				get_template_directory_uri() . '/assets/images/go-pro.svg',
 				esc_html__( 'Create a custom header with multiple options', 'hello-elementor' ),
 				esc_html__( 'Upgrade to Elementor Pro and enjoy free design and many more features', 'hello-elementor' ),
-				esc_html__( 'Upgrade', 'hello-elementor' ),
-				get_template_directory_uri() . '/assets/images/go-pro.svg'
+				'https://go.elementor.com/hello-theme-header/',
+				esc_html__( 'Upgrade', 'hello-elementor' )
 			);
 		} else {
-			return sprintf( '
-				<div class="hello-elementor elementor-nerd-box">
-					<img src="%4$s" class="elementor-nerd-box-icon">
-					<div class="elementor-nerd-box-message">
-						<p class="elementor-panel-heading-title elementor-nerd-box-title">%1$s</p>
-						<p class="elementor-nerd-box-message">%2$s</p>
-					</div>
-					<a class="elementor-button e-primary" target="_blank" href="%5$s">%3$s</a>
-				</div>
-				',
-				esc_html__( 'Create a custom header with the new Theme Builder', 'hello-elementor' ),
-				esc_html__( 'With the new Theme Builder you can jump directly into each part of your site', 'hello-elementor' ),
-				esc_html__( 'Create Header', 'hello-elementor' ),
+			return sprintf(
+				$content_template,
 				get_template_directory_uri() . '/assets/images/go-pro.svg',
-				get_admin_url( null, 'admin.php?page=elementor-app#/site-editor/templates/header' )
+				esc_html__( 'Create a custom header with the Theme Builder', 'hello-elementor' ),
+				esc_html__( 'With the Theme Builder you can jump directly into each part of your site', 'hello-elementor' ),
+				get_admin_url( null, 'admin.php?page=elementor-app#/site-editor/templates/header' ),
+				esc_html__( 'Create Header', 'hello-elementor' )
 			);
 		}
 	}