diff --git a/admin/templates/getting-started-home.php b/admin/templates/getting-started-home.php
index 7d8896acc..236e90a69 100644
--- a/admin/templates/getting-started-home.php
+++ b/admin/templates/getting-started-home.php
@@ -931,7 +931,7 @@ class="<?php echo esc_attr( $disabled_links ); ?>"
 				    <div class="responsive-theme-feature-cards-content">
 						<p class="responsive-theme-home-settings-text fw-bolder"><?php esc_html_e( 'Upgrade to PRO', 'responsive' ); ?></p>
 			            <p class="responsive-theme-home-desc-text "><?php esc_html_e('Upgrade to Cyberchimps Pro plan to unlock access to 150+ Premium Starter Templates and priority support.', 'responsive');?></p>
-						<button class="btn-upgrade" onclick="window.open('<?php echo esc_url('https://cyberchimps.com/pricing/?utm_source=wpdash&utm_medium=rtheme&utm_campaign=theme-home-tab&utm_content=upgrade'); ?>', '_blank')"><?php esc_html_e('Upgrade', 'responsive'); ?></button>
+						<button type="button" class="btn-upgrade" onclick="window.open('<?php echo esc_url('https://cyberchimps.com/pricing/?utm_source=wpdash&utm_medium=rtheme&utm_campaign=theme-home-tab&utm_content=upgrade'); ?>', '_blank')"><?php esc_html_e('Upgrade', 'responsive'); ?></button>
 					</div>
 				</div>
 			</div>
diff --git a/admin/templates/getting-started-settings.php b/admin/templates/getting-started-settings.php
index c0eb760c2..3429821dc 100644
--- a/admin/templates/getting-started-settings.php
+++ b/admin/templates/getting-started-settings.php
@@ -254,7 +254,7 @@
 						<p class="responsive-theme-setting-note"><strong><?php esc_html_e( 'Note', 'responsive' ); ?></strong> : <?php esc_html_e( 'Enable this option to hide White Label settings. Re-activate the Responsive Pro to enable this settings tab again.', 'responsive' ); ?></p>
 					</div>
 					<div class="responsive-theme-single-setting-section">
-						<button id="resp-theme-wl-settings-submit" class="button button-primary responsive-theme-setting-primary-btn" data-nonce="<?php echo esc_attr( wp_create_nonce( 'white_label_settings' ) ); ?>"><?php esc_html_e( 'Save Changes', 'responsive' ); ?></button>
+						<button type="button" id="resp-theme-wl-settings-submit" class="button button-primary responsive-theme-setting-primary-btn" data-nonce="<?php echo esc_attr( wp_create_nonce( 'white_label_settings' ) ); ?>"><?php esc_html_e( 'Save Changes', 'responsive' ); ?></button>
 					</div>
 				</div>
 					<?php
diff --git a/comments.php b/comments.php
index bc7152b1a..7ac19c0b4 100644
--- a/comments.php
+++ b/comments.php
@@ -37,7 +37,7 @@
 
 <?php if ( have_comments() ) : ?>
 	<div class="comments-area">
-		<h3 id="comments">
+		<h2 id="comments">
 			<?php
 			$responsive_comment_count = get_comments_number();
 			if ( '1' === $responsive_comment_count ) {
@@ -55,7 +55,7 @@
 				);
 			}
 			?>
-		</h3>
+		</h2>
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : ?>
 			<div class="navigation">
diff --git a/core/includes/customizer/assets/min/css/toggle.min.css b/core/includes/customizer/assets/min/css/toggle.min.css
index 57eebb747..31c491454 100644
--- a/core/includes/customizer/assets/min/css/toggle.min.css
+++ b/core/includes/customizer/assets/min/css/toggle.min.css
@@ -210,4 +210,8 @@
 }
 #customize-control-responsive_rp_excerpt_length .customize-control-title{
 	margin: 0;
+}
+#customize-control-responsive_footer_copyright_links_style .responsive-toggle-control-wrapper {
+    padding-top: 24px;
+    padding-bottom: 24px;
 }
\ No newline at end of file
diff --git a/core/includes/customizer/custom-styles.php b/core/includes/customizer/custom-styles.php
index 27b724e5d..e4bccd2a7 100644
--- a/core/includes/customizer/custom-styles.php
+++ b/core/includes/customizer/custom-styles.php
@@ -187,7 +187,7 @@ function responsive_customizer_styles() {
 	// Paragraph Margin Bottom.
 	$paragraph_margin_bottom = esc_html( get_theme_mod( 'responsive_paragraph_margin_bottom', '' ) );
 
-	$underline_content_links = esc_html( get_theme_mod( 'responsive_underline_content_links', false ) );
+	$underline_content_links = esc_html( get_theme_mod( 'responsive_underline_content_links', 1 ) );
 	// Site custom styles.
 
 	$container_max_width = esc_html( get_theme_mod( 'responsive_container_width', 1140 ) );
@@ -476,7 +476,7 @@ function responsive_customizer_styles() {
 
 	if ( $underline_content_links === '1' || $underline_content_links === true ) {
 		$custom_css .= '
-			.entry-content a:not(li > a),
+			.entry-content a,
 			.comment-content a:not(.comment-edit-link):not(li > a),
 			.woocommerce div.product .woocommerce-product-details__short-description a:not(li > a) {
 				text-decoration: underline;
@@ -5081,6 +5081,9 @@ function responsive_build_responsive_margin_spacing_css( $margin ) {
 	
 	if(Responsive\Core\responsive_check_element_present_in_hfb('footer_copyright', 'footer')) 
 	{
+		$copyright_links_val   = get_theme_mod( 'responsive_footer_copyright_links_style', 1 );
+		$copyright_links_style = ( '1' == $copyright_links_val || true === $copyright_links_val ) ? 'underline' : 'none';
+
 		$custom_css .= "
 			.footer-layouts.copyright {
 				text-align: {$copyright_alignment};
@@ -5091,6 +5094,7 @@ function responsive_build_responsive_margin_spacing_css( $margin ) {
 			}
 			.footer-layouts.copyright a {
 				color: {$copyright_links_color};
+				text-decoration: {$copyright_links_style};
 			}
 			.footer-layouts.copyright a:hover {
 				color: {$copyright_links_hover_color};
diff --git a/core/includes/customizer/settings/class-responsive-footer-copyright-customizer.php b/core/includes/customizer/settings/class-responsive-footer-copyright-customizer.php
index 600acc91e..2a0ed2b38 100644
--- a/core/includes/customizer/settings/class-responsive-footer-copyright-customizer.php
+++ b/core/includes/customizer/settings/class-responsive-footer-copyright-customizer.php
@@ -138,6 +138,12 @@ public function customizer_options( $wp_customize ) {
 			$footer_background_label = __( 'Links Color', 'responsive' );
 			responsive_color_control( $wp_customize, 'footer_copyright_links', $footer_background_label, 'responsive_footer_copyright', 70, Responsive\Core\get_responsive_customizer_defaults( 'footer_copyright_links' ), null, '', true, Responsive\Core\get_responsive_customizer_defaults( 'footer_copyright_links_hover' ), 'footer_copyright_links_hover' );
             
+			responsive_horizontal_separator_control($wp_customize, 'footer_copyright_links_separator', 1, 'responsive_footer_copyright', 74, 1, );
+
+			// Underline Content Links
+			responsive_toggle_control( $wp_customize, 'footer_copyright_links_style', esc_html__( 'Underline Links', 'responsive' ), 'responsive_footer_copyright', 78, true, '', 'refresh',
+			);
+
             // Typography
 			$footer_copyright_typography_label = __( 'Copyright Font', 'responsive' );
 			responsive_typography_group_control( $wp_customize, 'footer_copyright_typography_group', $footer_copyright_typography_label, 'responsive_footer_layout', 80, 'footer_copyright_typography' );
diff --git a/core/includes/customizer/settings/class-responsive-site-typography-customizer.php b/core/includes/customizer/settings/class-responsive-site-typography-customizer.php
index e4fc27321..eff11c82c 100644
--- a/core/includes/customizer/settings/class-responsive-site-typography-customizer.php
+++ b/core/includes/customizer/settings/class-responsive-site-typography-customizer.php
@@ -118,7 +118,7 @@ public function customizer_options( $wp_customize ) {
 				esc_html__( 'Underline Content Links', 'responsive' ),
 				'responsive_typography',
 				32, 
-				false, 
+				true, 
 				'',
 				'refresh',
 			);
diff --git a/core/includes/customizer/settings/class-responsive-typography-customizer.php b/core/includes/customizer/settings/class-responsive-typography-customizer.php
index 30944fd19..d71386e6a 100644
--- a/core/includes/customizer/settings/class-responsive-typography-customizer.php
+++ b/core/includes/customizer/settings/class-responsive-typography-customizer.php
@@ -167,7 +167,6 @@ public function elements() {
 					'defaults' => array(
 						'font-size'      => '12px',
 						'line-height'    => '1.75',
-						'text-transform' => 'uppercase',
 					),
 				),
 				'button'                     => array(
diff --git a/core/includes/functions.php b/core/includes/functions.php
index b62ad18b2..308c5ecb7 100644
--- a/core/includes/functions.php
+++ b/core/includes/functions.php
@@ -819,9 +819,7 @@ function responsive_post_meta_data() {
 					'<i class="icon-calendar" aria-hidden="true"></i><span class="%1$s">' . esc_html_e( 'Posted on', 'responsive' ) . '</span>%2$s<span class="%3$s"> ' . esc_html_e( 'By', 'responsive' ) . ' </span>%4$s',
 					'meta-prep meta-prep-author posted',
 					sprintf(
-						'<a href="%1$s" aria-label="%2$s" title="%2$s" rel="bookmark"><time class="timestamp updated" datetime="%3$s">%4$s</time></a>',
-						esc_url( get_permalink() ),
-						esc_attr( get_the_title() ),
+						'<time class="timestamp updated" datetime="%1$s">%2$s</time>',
 						esc_html( get_the_date( 'c' ) ),
 						esc_html( get_the_date() )
 					),
@@ -1103,7 +1101,7 @@ function defaults() {
 			'header_border'                       => '#eaeaea',
 			'header_site_title'                   => '#333333',
 			'header_site_title_hover'             => '#10659C',
-			'header_text'                         => '#999999',
+			'header_text'                         => '#333333',
 			'header_widget_text'                  => '#333333',
 			'header_widget_background'            => '#ffffff',
 			'header_widget_border'                => '#eaeaea',
@@ -1160,7 +1158,7 @@ function defaults() {
 			'h4_text'                             => '#333333', 
 			'h5_text'                             => '#333333', 
 			'h6_text'                             => '#333333', 
-			'meta_text'                           => '#999999',
+			'meta_text'                           => '#0066CC',
 			'link'                                => '#0066CC',
 			'link_hover'                          => '#10659C',
 			'button'                              => '#0066CC',
diff --git a/core/includes/modules/related-posts/class-responsive-related-posts.php b/core/includes/modules/related-posts/class-responsive-related-posts.php
index b376a335d..def0b4821 100644
--- a/core/includes/modules/related-posts/class-responsive-related-posts.php
+++ b/core/includes/modules/related-posts/class-responsive-related-posts.php
@@ -354,9 +354,7 @@ public function responsive_get_related_single_post_meta_data($current_post_id)
 								'<i class="icon-calendar" aria-hidden="true"></i><span>' . esc_html_e('Posted on ', 'responsive') . '</span><span class="%1$s" itemprop="datePublished">%2$s</span>',
 								'meta-prep meta-prep-author posted',
 								sprintf(
-									'<a href="%1$s" aria-label="%2$s" title="%2$s" rel="bookmark"><time class="timestamp updated" datetime="%3$s" itemprop="dateModified">%4$s</time></a>',
-									esc_url(get_permalink()),
-									esc_attr(get_the_title()),
+									'<time class="timestamp updated" datetime="%1$s" itemprop="dateModified">%2$s</time>',
 									esc_html(get_the_date('c')),
 									esc_html(get_the_date())
 								)
diff --git a/core/includes/template-functions/mobile-header-functions.php b/core/includes/template-functions/mobile-header-functions.php
index 1c1d1507f..9ad21c07a 100644
--- a/core/includes/template-functions/mobile-header-functions.php
+++ b/core/includes/template-functions/mobile-header-functions.php
@@ -181,7 +181,7 @@ function responsive_render_off_canvas_panel() {
 				?>
 			</div>
 			<?php if ( 'fullscreen' === $mobile_menu_style || 'sidebar' === $mobile_menu_style ) : ?>
-				<button class="responsive-off-canvas-panel-close" aria-label="<?php esc_attr_e( 'Close Menu', 'responsive' ); ?>">
+				<button type="button" class="responsive-off-canvas-panel-close" aria-label="<?php esc_attr_e( 'Close Menu', 'responsive' ); ?>">
 					<i class="icon-times"></i>
 				</button>
 			<?php endif; ?>
diff --git a/core/includes/theme-updates/class-responsive-theme-background-updater.php b/core/includes/theme-updates/class-responsive-theme-background-updater.php
index 6c1054fbc..2da561d2c 100644
--- a/core/includes/theme-updates/class-responsive-theme-background-updater.php
+++ b/core/includes/theme-updates/class-responsive-theme-background-updater.php
@@ -42,7 +42,10 @@ class Responsive_Theme_Background_Updater {
                 'responsive_theme_background_updater_mobile_header_widgets_6_2_9',
                 'responsive_theme_background_updater_off_canvas_menu_6_2_9',
                 'responsive_theme_background_updater_off_canvas_fonts_toggle_button_color_new_6_2_9'
-            )
+            ),
+            '6.3.0' => array (
+                'responsive_theme_background_updater_accessibility_ready',
+            ),
 		);
 
         /**
diff --git a/core/sass/style.scss b/core/sass/style.scss
index 132b1f4f4..f72bd6c7b 100644
--- a/core/sass/style.scss
+++ b/core/sass/style.scss
@@ -131,4 +131,10 @@ body {
 }
 .admin-bar #page {
 	min-height: calc(100vh - 32px);
+}
+h1, h2, h3, h4, h5, h6 {
+	a {
+		color: inherit;
+		text-decoration: none;
+	}
 }
\ No newline at end of file
diff --git a/functions.php b/functions.php
index 156695993..cbc117bc7 100644
--- a/functions.php
+++ b/functions.php
@@ -2761,3 +2761,31 @@ function responsive_theme_background_updater_off_canvas_fonts_toggle_button_colo
 		}
 	}
 }
+
+if ( ! function_exists( 'responsive_theme_background_updater_accessibility_ready' ) ) {
+
+	/**
+	 * Runs the accessibility-ready backward compatibility update.
+	 *
+	 * Once completed, the update marks itself as done by setting
+	 * `accessibility-ready-backward-done` to true inside the theme options.
+	 *
+	 * @return void
+	 */
+	function responsive_theme_background_updater_accessibility_ready() {
+		$responsive_options = Responsive\Core\responsive_get_options();
+
+		// Run only if not set OR false/empty
+		if ( empty( $responsive_options['accessibility-ready-backward-done'] ) ) {
+			$old_underline_content_links = get_theme_mod( 'responsive_underline_content_links' );
+			set_theme_mod( 'responsive_underline_content_links', $old_underline_content_links == '1' || $old_underline_content_links === true );
+
+			$old_meta_text_color = get_theme_mod( 'responsive_meta_text_color', '#999999' );
+			set_theme_mod( 'responsive_meta_text_color', $old_meta_text_color );
+		}
+
+		// Making backward compatibility update as done.
+		$responsive_options['accessibility-ready-backward-done'] = true;
+		update_option( 'responsive_theme_options', $responsive_options );
+	}
+}
diff --git a/partials/entry/meta.php b/partials/entry/meta.php
index bff67ae07..58e2e882c 100644
--- a/partials/entry/meta.php
+++ b/partials/entry/meta.php
@@ -35,9 +35,7 @@
 						'<span class="%3$s">' . esc_html_e( 'By ', 'responsive' ) . '</span>%4$s',
 						'meta-prep meta-prep-author posted',
 						sprintf(
-							'<a href="%1$s" aria-label="%2$s" title="%2$s" rel="bookmark"><time class="timestamp updated" datetime="%3$s">%4$s</time></a>',
-							esc_url( get_permalink() ),
-							esc_attr( get_the_title() ),
+							'<time class="timestamp updated" datetime="%1$s">%2$s</time>',
 							esc_html( get_the_date( 'c' ) ),
 							esc_html( get_the_date() )
 						),
@@ -69,9 +67,7 @@
 							'<i class="icon-calendar" aria-hidden="true"></i><span>' . esc_html_e( 'Posted on ', 'responsive' ) . '</span><span class="%1$s" itemprop="datePublished">%2$s</span>',
 							'meta-prep meta-prep-author posted',
 							sprintf(
-								'<a href="%1$s" aria-label="%2$s" title="%2$s" rel="bookmark"><time class="timestamp updated" datetime="%3$s" itemprop="dateModified">%4$s</time></a>',
-								esc_url( get_permalink() ),
-								esc_attr( get_the_title() ),
+								'<time class="timestamp updated" datetime="%1$s" itemprop="dateModified">%2$s</time>',
 								esc_html( get_the_date( 'c' ) ),
 								esc_html( get_the_date() )
 							)
@@ -90,9 +86,7 @@
 							'<i class="icon-calendar" aria-hidden="true"></i><span>' . esc_html_e( 'Last updated on ', 'responsive' ) . '</span><span class="%1$s" itemprop="datePublished">%2$s</span>',
 							'meta-prep meta-prep-author posted',
 							sprintf(
-								'<a href="%1$s" aria-label="%2$s" title="%2$s" rel="bookmark"><time class="timestamp updated" datetime="%3$s" itemprop="dateModified">%4$s</time></a>',
-								esc_url( get_permalink() ),
-								esc_attr( get_the_title() ),
+								'<time class="timestamp updated" datetime="%1$s" itemprop="dateModified">%2$s</time>',
 								esc_html( get_the_modified_date( 'c' ) ),
 								esc_html( get_the_modified_date() )
 							)
diff --git a/partials/single/meta.php b/partials/single/meta.php
index 6cc72b447..5efb9024a 100644
--- a/partials/single/meta.php
+++ b/partials/single/meta.php
@@ -63,9 +63,7 @@
 						'<i class="icon-calendar" aria-hidden="true"></i><span>' . esc_html_e( 'Posted on ', 'responsive' ) . '</span><span class="%1$s" itemprop="datePublished">%2$s</span>',
 						'meta-prep meta-prep-author posted',
 						sprintf(
-							'<a href="%1$s" aria-label="%2$s" title="%2$s" rel="bookmark"><time class="timestamp updated" datetime="%3$s" itemprop="dateModified">%4$s</time></a>',
-							esc_url( get_permalink() ),
-							esc_attr( get_the_title() ),
+							'<time class="timestamp updated" datetime="%1$s" itemprop="dateModified">%2$s</time>',
 							esc_html( get_the_date( 'c' ) ),
 							esc_html( get_the_date() )
 						)
@@ -84,9 +82,7 @@
 							'<i class="icon-calendar" aria-hidden="true"></i><span>' . esc_html_e( 'Last updated on ', 'responsive' ) . '</span><span class="%1$s" itemprop="datePublished">%2$s</span>',
 							'meta-prep meta-prep-author posted',
 							sprintf(
-								'<a href="%1$s" aria-label="%2$s" title="%2$s" rel="bookmark"><time class="timestamp updated" datetime="%3$s" itemprop="dateModified">%4$s</time></a>',
-								esc_url( get_permalink() ),
-								esc_attr( get_the_title() ),
+								'<time class="timestamp updated" datetime="%1$s" itemprop="dateModified">%2$s</time>',
 								esc_html( get_the_modified_date( 'c' ) ),
 								esc_html( get_the_modified_date() )
 							)
diff --git a/searchform.php b/searchform.php
index 98e80bf90..35a41f0a8 100644
--- a/searchform.php
+++ b/searchform.php
@@ -19,11 +19,11 @@
 }
 $search_screen = get_theme_mod( 'search_style', 'search' );
 ?>
-<form method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+<form role="search" method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label class="screen-reader-text" for="s"><?php esc_html_e( 'Search for:', 'responsive' ); ?></label>
 	<div class="res-search-wrapper">
 	<input type="search" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search here &hellip;', 'responsive' ); ?>" />
-	<button type="submit" class="search-submit" value="Search">	<span class="res-search-icon icon-search"></span></button>
+	<button type="submit" class="search-submit" value="Search" aria-label="<?php esc_attr_e( 'Search', 'responsive' ); ?>">	<span class="res-search-icon icon-search"></span></button>
 </div>
 </form>
 <?php
diff --git a/template-parts/footer/footer_copyright.php b/template-parts/footer/footer_copyright.php
index 6a6e5f5bd..ab8a32cab 100644
--- a/template-parts/footer/footer_copyright.php
+++ b/template-parts/footer/footer_copyright.php
@@ -49,16 +49,7 @@
                 )
                 ?>
             </span>
-            <a href= "
-            <?php
-            echo apply_filters(
-                'responsive_theme_footer_link',
-                esc_url( 'https://cyberchimps.com/')
-            );
-            ?>
-                "
-                target="_blank"
-                >
+            <a href= "<?php echo apply_filters( 'responsive_theme_footer_link', esc_url( 'https://cyberchimps.com/') ); ?>" target="_blank" >
                 <?php
                 echo apply_filters(
                     'responsive_theme_footer_theme_text',
diff --git a/template-parts/header/logo.php b/template-parts/header/logo.php
index 92d13ed72..781b43cac 100644
--- a/template-parts/header/logo.php
+++ b/template-parts/header/logo.php
@@ -39,11 +39,11 @@
 			>
 				<?php if ( $show_title ) : ?>
 					<?php if ( is_front_page() && is_home() ) : ?>
-						<h1 class="site-title" <?php responsive_schema_markup( 'site-title' ); ?>>
+						<span class="site-title" <?php responsive_schema_markup( 'site-title' ); ?>>
 							<a href="<?php echo esc_url( get_theme_mod( 'responsive_custom_logo_url', home_url( '/' ) ) ); ?>" rel="home">
 								<?php bloginfo( 'name' ); ?>
 							</a>
-						</h1>
+						</span>
 					<?php else : ?>
 						<span class="site-title">
 							<a href="<?php echo esc_url( get_theme_mod( 'responsive_custom_logo_url', home_url( '/' ) ) ); ?>" rel="home">
diff --git a/template-parts/header/primary_navigation.php b/template-parts/header/primary_navigation.php
index 9f5874121..0c47b6213 100644
--- a/template-parts/header/primary_navigation.php
+++ b/template-parts/header/primary_navigation.php
@@ -61,7 +61,7 @@
 			
 			?>
 			
-			<button class="menu-toggle" aria-controls="header-menu" aria-expanded="false"><?php echo $svg_markup; ?><span class="hamburger-menu-label"><?php printf( esc_html( $hamburger_menu_label ) ); ?></span><span class="screen-reader-text"><?php esc_html_e( 'Menu', 'responsive' ); ?></span></button>
+			<button type="button" class="menu-toggle" aria-controls="header-menu" aria-expanded="false"><?php echo $svg_markup; ?><span class="hamburger-menu-label"><?php printf( esc_html( $hamburger_menu_label ) ); ?></span><span class="screen-reader-text"><?php esc_html_e( 'Menu', 'responsive' ); ?></span></button>
 			<?php } ?>
 			<?php
 			$disable_menu = get_theme_mod( 'responsive_disable_menu', 0 );
diff --git a/template-parts/header/search.php b/template-parts/header/search.php
index 83867d0e4..04fe94eb3 100644
--- a/template-parts/header/search.php
+++ b/template-parts/header/search.php
@@ -35,7 +35,7 @@
     if ( 'search-box' === $search_style ) {
         ?>
             <div class="search-type-box responsive-header-inline-search">
-                <form method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+                <form role="search" method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
                     <label class="screen-reader-text" for="s"><?php esc_html_e( 'Search for:', 'responsive' ); ?></label>
                     <div class="res-search-wrapper responsive-header-search-icon-wrap">
                         <input type="search" class="search-field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search &hellip;', 'responsive' ); ?>" autocomplete="off" />
@@ -52,7 +52,7 @@
     } else if( 'search' === $search_style ) {
     ?>
         <div class="search-type-responsive-slide">
-            <form method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+            <form role="search" method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
                 <label class="screen-reader-text" for="s"><?php esc_html_e( 'Search for:', 'responsive' ); ?></label>
                 <div class="res-search-wrapper responsive-header-search-icon-wrap">
                     <input type="search" class="search-field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search &hellip;', 'responsive' ); ?>" autocomplete="off" />
@@ -79,7 +79,7 @@
             <span id="search-close-<?php echo esc_attr( $unique_id ); ?>" class="search-close" data-search-close="<?php echo esc_attr( $unique_id ); ?>"></span>
             <div class="full-screen-search-container">
                 <div class="container">
-                <form method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
+                <form role="search" method="get" id="searchform" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
                     <label class="screen-reader-text" for="s"><?php esc_html_e( 'Search for:', 'responsive' ); ?></label>
                     <div class="res-search-wrapper">
                         <input type="search" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search here &hellip;', 'responsive' ); ?>" autocomplete="off" />
diff --git a/template-parts/header/toggle_button.php b/template-parts/header/toggle_button.php
index 109e94536..49689b8ab 100644
--- a/template-parts/header/toggle_button.php
+++ b/template-parts/header/toggle_button.php
@@ -31,7 +31,7 @@
 
 ?>
 <div class="site-header-item site-header-focus-item site-header-item-toggle-button" data-section="responsive_customizer_header_toggle_button">
-	<button class="menu-toggle" aria-controls="responsive-off-canvas-panel" aria-expanded="false" aria-label="<?php esc_attr_e( 'Toggle Menu', 'responsive' ); ?>">
+	<button type="button" class="menu-toggle" aria-controls="responsive-off-canvas-panel" aria-expanded="false" aria-label="<?php esc_attr_e( 'Toggle Menu', 'responsive' ); ?>">
 		<?php echo $svg_markup; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
 		<?php if ( ! empty( $hamburger_menu_label ) ) : ?>
 			<span class="hamburger-menu-label"><?php echo esc_html( $hamburger_menu_label ); ?></span>