diff --git a/admin/class-collapsible-presenter.php b/admin/class-collapsible-presenter.php
index 6d6459ffba7..8d9eb99444f 100644
--- a/admin/class-collapsible-presenter.php
+++ b/admin/class-collapsible-presenter.php
@@ -22,7 +22,7 @@ public function __construct( $title, $view_file = '', array $settings = [] ) {
 		$defaults = [
 			'paper_id'                 => null,
 			'paper_id_prefix'          => 'wpseo-',
-			'collapsible'              => false,
+			'collapsible'              => true,
 			'collapsible_header_class' => '',
 			'expanded'                 => false,
 			'help_button'              => '',
diff --git a/admin/class-yoast-form.php b/admin/class-yoast-form.php
index cd43a58c887..f431683c018 100644
--- a/admin/class-yoast-form.php
+++ b/admin/class-yoast-form.php
@@ -75,7 +75,7 @@ public function admin_header( $form = true, $option = 'wpseo', $contains_files =
 		 */
 		require_once ABSPATH . 'wp-admin/options-head.php';
 		?>
-		<h1 id="wpseo-title"><?php echo esc_html( get_admin_page_title() ); ?></h1>
+		<div class="wpseo_content_cell"><h1 id="wpseo-title"><?php echo esc_html( get_admin_page_title() ); ?></h1></div>
 		<div class="wpseo_content_wrapper yoast-layout">
 			<div class="wpseo_content_cell" id="wpseo_content_top">
 		<?php
@@ -130,9 +130,9 @@ public function admin_footer( $submit = true, $show_sidebar = true ) {
 			$settings_changed_listener = new WPSEO_Admin_Settings_Changed_Listener();
 
 			echo '<div id="wpseo-submit-container">';
-			submit_button( __( 'Save changes', 'wordpress-seo' ), 'yoast-button yoast-button--primary' );
-
 			$settings_changed_listener->show_success_message();
+
+			submit_button( __( 'Save changes', 'wordpress-seo' ), 'yoast-button yoast-button--primary' );
 			echo '</div>';
 
 			echo PHP_EOL . '</form>';
@@ -312,9 +312,12 @@ public function light_switch( $var, $label, $buttons = [], $help = '', $inverse
 			$class .= '--inverse';
 		}
 
-
 		if ( empty( $buttons ) ) {
 			$buttons = [ __( 'Disabled', 'wordpress-seo' ), __( 'Enabled', 'wordpress-seo' ) ];
+
+			if ( $inverse ) {
+				$buttons = array_reverse( $buttons );
+			}
 		}
 
 		list( $off_button, $on_button ) = $buttons;
@@ -363,7 +366,7 @@ public function light_switch_disabled( $var, $label, $buttons = [], $help = '',
 		'<span class="yoast-toggle--inactive" aria-hidden="true">', esc_html( $off_button ), '</span>',
 		'<span class="yoast-toggle--active" aria-hidden="true">', esc_html( $on_button ), '</span>',
 		'</div>',
-		'<a href="', $url, '" class="yoast-button yoast-button--buy yoast-button--buy-small">', __( 'Upgrade to premium', 'wordpress-seo' ) ,'<span class="yoast-button--buy__caret"></span></a>',
+		'<a href="', $url, '" class="yoast-button yoast-button--buy yoast-button--buy-small">', __( 'Upgrade to Premium', 'wordpress-seo' ) ,'<span class="yoast-button--buy__caret"></span></a>',
 		'</div>';
 	}
 
@@ -421,7 +424,13 @@ public function textinput( $var, $label, $attr = [] ) {
 		id="', esc_attr( $var ), '"
 		name="', esc_attr( $this->option_name ), '[', esc_attr( $var ), ']"
 		value="', esc_attr( $val ), '"',
-		disabled( $this->is_control_disabled( $var ), true, false ), '/>', '</div>';
+		disabled( $this->is_control_disabled( $var ), true, false ), '/>';
+
+		if ( ! empty( $attr['html_after'] ) ) {
+			echo $attr['html_after'];
+		}
+
+		echo '</div>';
 
 		echo Yoast_Input_Validation::get_the_error_description( $var );
 	}
@@ -628,7 +637,6 @@ public function media_input( $var, $label ) {
 				' value="', esc_attr( $id_value ), '"',
 				' />';
 		echo '</div>';
-		echo '<br class="clear"/>';
 	}
 
 	/**
@@ -825,21 +833,15 @@ public function toggle_switch( $var, $values, $label, $help = '' ) {
 	 * @return void
 	 */
 	public function index_switch( $var, $label, $help = '' ) {
-		$index_switch_values = [
-			__( 'Yes', 'wordpress-seo' ),
-			__( 'No', 'wordpress-seo' ),
-		];
-
-		$this->light_switch(
+		$this->show_hide_switch(
 			$var,
 			sprintf(
 			/* translators: %s expands to an indexable object's name, like a post type or taxonomy */
 				esc_html__( 'Show %s in search results?', 'wordpress-seo' ),
 				esc_html( $label )
 			),
-			$index_switch_values,
-			$help,
-			true
+			true,
+			$help
 		);
 	}
 
@@ -854,12 +856,16 @@ public function index_switch( $var, $label, $help = '' ) {
 	 * @return void
 	 */
 	public function show_hide_switch( $var, $label, $inverse_keys = false, $help = '' ) {
-		$show_hide_switch = [
+		$labels = [
 			__( 'Hide', 'wordpress-seo' ),
 			__( 'Show', 'wordpress-seo' ),
 		];
 
-		$this->light_switch( $var, $label, $show_hide_switch, $help, $inverse_keys );
+		if ( $inverse_keys ) {
+			$labels = array_reverse( $labels );
+		}
+
+		$this->light_switch( $var, $label, $labels, $help, $inverse_keys );
 	}
 
 	/**
diff --git a/admin/pages/tools.php b/admin/pages/tools.php
index 143bcc692a7..199ffaf9554 100644
--- a/admin/pages/tools.php
+++ b/admin/pages/tools.php
@@ -12,67 +12,30 @@
 }
 
 $tool_page = (string) filter_input( INPUT_GET, 'tool' );
+$admin_url = admin_url( 'admin.php?page=wpseo_tools' );
 
-$yform = Yoast_Form::get_instance();
-$yform->admin_header( false, 'tools' );
-
-if ( $tool_page === '' ) {
-
-	$tools = [];
-
-	$tools['import-export'] = [
-		'title' => __( 'Import and Export', 'wordpress-seo' ),
-		'desc'  => __( 'Import settings from other SEO plugins and export your settings for re-use on (another) blog.', 'wordpress-seo' ),
-	];
-
-	if ( WPSEO_Utils::allow_system_file_edit() === true && ! is_multisite() ) {
-		$tools['file-editor'] = [
-			'title' => __( 'File editor', 'wordpress-seo' ),
-			'desc'  => __( 'This tool allows you to quickly change important files for your SEO, like your robots.txt and, if you have one, your .htaccess file.', 'wordpress-seo' ),
-		];
-	}
-
-	$tools['bulk-editor'] = [
-		'title' => __( 'Bulk editor', 'wordpress-seo' ),
-		'desc'  => __( 'This tool allows you to quickly change titles and descriptions of your posts and pages without having to go into the editor for each page.', 'wordpress-seo' ),
-	];
-
-	echo '<p>';
-	printf(
-		/* translators: %1$s expands to Yoast SEO */
-		esc_html__( '%1$s comes with some very powerful built-in tools:', 'wordpress-seo' ),
-		'Yoast SEO'
-	);
-	echo '</p>';
-
-	echo '<ul class="yoast-list">';
+$tools = [];
 
-	$admin_url = admin_url( 'admin.php?page=wpseo_tools' );
+$tools['general'] = [
+	'title' => __( 'General', 'wordpress-seo' ),
+	'href' => '',
+];
 
-	foreach ( $tools as $slug => $tool ) {
-		$href = ( ! empty( $tool['href'] ) ) ? $admin_url . $tool['href'] : add_query_arg( [ 'tool' => $slug ], $admin_url );
-		$attr = ( ! empty( $tool['attr'] ) ) ? $tool['attr'] : '';
+$tools['import-export'] = [ 'title' => __( 'Import and Export', 'wordpress-seo' ) ];
 
-		echo '<li>';
-		echo '<a href="', esc_url( $href ), '" ', esc_attr( $attr ) , '>', esc_html( $tool['title'] ), '</a><br/>';
-		echo esc_html( $tool['desc'] );
-		echo '</li>';
-	}
+if ( WPSEO_Utils::allow_system_file_edit() === true && ! is_multisite() ) {
+	$tools['file-editor'] = [ 'title' => __( 'File editor', 'wordpress-seo' ) ];
+}
 
-	/**
-	 * Action: 'wpseo_tools_overview_list_items' - Hook to add additional tools to the overview.
-	 */
-	do_action( 'wpseo_tools_overview_list_items' );
+$tools['bulk-editor'] = [ 'title' => __( 'Bulk editor', 'wordpress-seo' ) ];
 
-	echo '</ul>';
+$yform = Yoast_Form::get_instance();
+$yform->admin_header( false, 'tools' );
 
-	echo '<input type="hidden" id="wpseo_recalculate_nonce" name="wpseo_recalculate_nonce" value="' . esc_attr( wp_create_nonce( 'wpseo_recalculate' ) ) . '" />';
-}
-else {
-	echo '<a href="', esc_url( admin_url( 'admin.php?page=wpseo_tools' ) ), '">', esc_html__( '&laquo; Back to Tools page', 'wordpress-seo' ), '</a>';
+require_once WPSEO_PATH . 'admin/views/tools-navigation.php';
 
+if ( ! empty( $tool_page ) ) {
 	$tool_pages = [ 'bulk-editor', 'import-export' ];
-
 	if ( WPSEO_Utils::allow_system_file_edit() === true && ! is_multisite() ) {
 		$tool_pages[] = 'file-editor';
 	}
@@ -80,6 +43,27 @@
 	if ( in_array( $tool_page, $tool_pages, true ) ) {
 		require_once WPSEO_PATH . 'admin/views/tool-' . $tool_page . '.php';
 	}
+
+	$yform->admin_footer( false );
+
+	return;
 }
 
+echo '<div class="yoast-paper">';
+
+echo '<ul class="yoast-list">';
+
+$admin_url = admin_url( 'admin.php?page=wpseo_tools' );
+
+/**
+ * Action: 'wpseo_tools_overview_list_items' - Hook to add additional tools to the overview.
+ */
+do_action( 'wpseo_tools_overview_list_items' );
+
+echo '</ul>';
+
+echo '<input type="hidden" id="wpseo_recalculate_nonce" name="wpseo_recalculate_nonce" value="' . esc_attr( wp_create_nonce( 'wpseo_recalculate' ) ) . '" />';
+
+echo '</div>'; // yoast-paper.
+
 $yform->admin_footer( false );
diff --git a/admin/views/class-view-utils.php b/admin/views/class-view-utils.php
index 0c908e89d63..0c009623a4f 100644
--- a/admin/views/class-view-utils.php
+++ b/admin/views/class-view-utils.php
@@ -58,7 +58,7 @@ public function show_post_type_settings( $post_type, $paper_style = false ) {
 
 		$this->form->show_hide_switch(
 			'showdate-' . $post_type->name,
-			__( 'Date in Google Preview', 'wordpress-seo' )
+			__( 'Show date in Google Preview', 'wordpress-seo' )
 		);
 
 		$this->form->show_hide_switch(
diff --git a/admin/views/class-yoast-feature-toggles.php b/admin/views/class-yoast-feature-toggles.php
index 083f078c801..89f76c8e9b1 100644
--- a/admin/views/class-yoast-feature-toggles.php
+++ b/admin/views/class-yoast-feature-toggles.php
@@ -140,22 +140,6 @@ protected function load_toggles() {
 				'read_more_url'   => 'https://yoa.st/usage-tracking',
 				'order'   => 95,
 			],
-			(object) [
-				'name'    => __( 'Usage tracking', 'wordpress-seo' ),
-				'setting' => 'tracking',
-				'label'   => sprintf(
-				/* translators: 1: Yoast SEO */
-					__( 'Allow us to track some data about your site to improve our plugin.', 'wordpress-seo' ),
-					'Yoast SEO'
-				),
-				'read_more_label' => sprintf(
-				/* translators: 1: Yoast SEO */
-					__( 'Read more about what we\'ll track.', 'wordpress-seo' ),
-					'Yoast SEO'
-				),
-				'read_more_url'   => 'https://yoa.st/usage-tracking',
-				'order'   => 95,
-			],
 			(object) [
 				'name'    => __( 'REST API: Head endpoint', 'wordpress-seo' ),
 				'setting' => 'enable_headless_rest_endpoints',
diff --git a/admin/views/partial-notifications-template.php b/admin/views/partial-notifications-template.php
index eabfea25580..86c0ed16efb 100644
--- a/admin/views/partial-notifications-template.php
+++ b/admin/views/partial-notifications-template.php
@@ -30,7 +30,6 @@ function _yoast_display_notifications( $list, $status ) {
 		$notifications = '';
 
 		foreach ( $list as $notification ) {
-
 			switch ( $status ) {
 				case 'active':
 					$button = sprintf(
@@ -77,12 +76,11 @@ function _yoast_display_notifications( $list, $status ) {
 
 <div>
 	<?php if ( $total ) : ?>
-		<div class="yoast-paper__content">
-			<?php
-			// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: _yoast_display_notifications is considered a safe function.
-			echo _yoast_display_notifications( $active, 'active' );
-			?>
-		</div>
+		<?php
+		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: _yoast_display_notifications is considered a safe function.
+		echo _yoast_display_notifications( $active, 'active' );
+		?>
+
 
 		<?php
 		if ( $dismissed ) {
diff --git a/admin/views/sidebar.php b/admin/views/sidebar.php
index 3ef95ae61ec..70941e63a43 100644
--- a/admin/views/sidebar.php
+++ b/admin/views/sidebar.php
@@ -16,6 +16,7 @@
 		printf( esc_html__( '%1$s recommendations for you', 'wordpress-seo' ), 'Yoast' );
 		?>
 	</h2>
+
 	<div class="yoast-paper yoast-paper--small">
 		<h3 class="yoast-sidebar__title">
 			<?php
@@ -49,92 +50,92 @@
 			?>
 		</a><br>
 	</div>
-	<div class="yoast-sidebar__product-list">
-		<div class="yoast-paper yoast-paper--small">
-			<h3 class="yoast-sidebar__title">
-				<?php
-				/* translators: %s expands to Yoast SEO */
-				printf( esc_html__( 'Extend %s', 'wordpress-seo' ), 'Yoast SEO' );
-				?>
-			</h3>
-			<div class="yoast-sidebar__plugins">
-				<div class="yoast-sidebar__plugins-content-left">
-					<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jq' ); ?>" target="_blank">
-						Be found on Google Maps!
-						<?php
-						// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
-						echo $new_tab_message;
-						?>
-					</a>
-					<p><?php esc_html_e( 'Our Local SEO plugin will help you rank in Google Maps and local results.', 'wordpress-seo' ); ?></p>
-				</div>
-				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jq' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
-					<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/local_plugin_assistant_small.svg' ); ?>" alt="">
+
+	<div class="yoast-paper yoast-paper--small yoast-sidebar__product-list">
+		<h3 class="yoast-sidebar__title">
+			<?php
+			/* translators: %s expands to Yoast SEO */
+			printf( esc_html__( 'Extend %s', 'wordpress-seo' ), 'Yoast SEO' );
+			?>
+		</h3>
+		<div class="yoast-sidebar__plugins">
+			<div class="yoast-sidebar__plugins-content-left">
+				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jq' ); ?>" target="_blank">
+					Be found on Google Maps!
 					<?php
 					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
 					echo $new_tab_message;
 					?>
 				</a>
+				<p><?php esc_html_e( 'Our Local SEO plugin will help you rank in Google Maps and local results.', 'wordpress-seo' ); ?></p>
 			</div>
-			<div class="yoast-sidebar__plugins">
-				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jo' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
-					<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/video_plugin_assistant_small.svg' ); ?>" alt="">
+			<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jq' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
+				<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/local_plugin_assistant_small.svg' ); ?>" alt="">
+				<?php
+				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
+				echo $new_tab_message;
+				?>
+			</a>
+		</div>
+		<div class="yoast-sidebar__plugins">
+			<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jo' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
+				<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/video_plugin_assistant_small.svg' ); ?>" alt="">
+				<?php
+				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
+				echo $new_tab_message;
+				?>
+			</a>
+			<div class="yoast-sidebar__plugins-content-right">
+				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jo' ); ?>" target="_blank">
+					Rank in Google Video
 					<?php
 					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
 					echo $new_tab_message;
 					?>
 				</a>
-				<div class="yoast-sidebar__plugins-content-right">
-					<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jo' ); ?>" target="_blank">
-						Rank in Google Video
-						<?php
-						// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
-						echo $new_tab_message;
-						?>
-					</a>
-					<p><?php esc_html_e( 'Make sure your videos rank and are easy to share with our Video SEO plugin.', 'wordpress-seo' ); ?></p>
-				</div>
+				<p><?php esc_html_e( 'Make sure your videos rank and are easy to share with our Video SEO plugin.', 'wordpress-seo' ); ?></p>
 			</div>
-			<div class="yoast-sidebar__plugins">
-				<div class="yoast-sidebar__plugins-content-left">
-					<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jp' ); ?>" target="_blank">
-						WooCommerce SEO
-						<?php
-						// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
-						echo $new_tab_message;
-						?>
-					</a>
-					<p><?php esc_html_e( 'Optimize your shop\'s SEO and sell more products!', 'wordpress-seo' ); ?></p>
-				</div>
-				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jp' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
-					<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/woo_plugin_assistant_small.svg' ); ?>" alt="">
+		</div>
+		<div class="yoast-sidebar__plugins">
+			<div class="yoast-sidebar__plugins-content-left">
+				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jp' ); ?>" target="_blank">
+					WooCommerce SEO
 					<?php
 					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
 					echo $new_tab_message;
 					?>
 				</a>
+				<p><?php esc_html_e( 'Optimize your shop\'s SEO and sell more products!', 'wordpress-seo' ); ?></p>
 			</div>
-			<div class="yoast-sidebar__plugins">
-				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jr' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
-					<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/news_plugin_assistant_small.svg' ); ?>" alt="">
+			<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jp' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
+				<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/woo_plugin_assistant_small.svg' ); ?>" alt="">
+				<?php
+				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
+				echo $new_tab_message;
+				?>
+			</a>
+		</div>
+		<div class="yoast-sidebar__plugins">
+			<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jr' ); ?>" target="_blank" class="yoast-sidebar__plugins-image">
+				<img src="<?php echo esc_url( $wpseo_plugin_dir_url . 'images/news_plugin_assistant_small.svg' ); ?>" alt="">
+				<?php
+				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
+				echo $new_tab_message;
+				?>
+			</a>
+			<div class="yoast-sidebar__plugins-content-right">
+				<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jr' ); ?>" target="_blank">
+					Rank in Google News
 					<?php
 					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
 					echo $new_tab_message;
 					?>
 				</a>
-				<div class="yoast-sidebar__plugins-content-right">
-					<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jr' ); ?>" target="_blank">
-						Rank in Google News
-						<?php
-						// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
-						echo $new_tab_message;
-						?>
-					</a>
-					<p><?php esc_html_e( 'Start to optimize your site for Google News traffic today!', 'wordpress-seo' ); ?></p>
-				</div>
+				<p><?php esc_html_e( 'Start to optimize your site for Google News traffic today!', 'wordpress-seo' ); ?></p>
 			</div>
 		</div>
 	</div>
+
 	<div class="yoast-paper yoast-paper--small">
 		<h3 class="yoast-sidebar__title">
 			<?php
@@ -151,28 +152,22 @@
 			esc_html_e( 'We have both free and premium online courses to learn everything you need to know about SEO.', 'wordpress-seo' );
 			?>
 		</p>
-		<p>
-			<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/3t6' ); ?>" target="_blank">
-				<?php
+
+		<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/3t6' ); ?>" target="_blank"><?php
 				/* translators: %1$s expands to Yoast SEO academy */
-				printf( esc_html__( 'Check out %1$s', 'wordpress-seo' ), 'Yoast SEO academy' );
-				?>
-			</a>
-		</p>
+				printf( esc_html__( 'Check out %1$s', 'wordpress-seo' ), 'Yoast SEO academy' );  ?></a>
 	</div>
+
 	<div class="yoast-paper yoast-paper--small">
 		<h3 class="yoast-sidebar__title">
 			<?php esc_html_e( 'Remove these ads?', 'wordpress-seo' ); ?>
 		</h3>
-		<p>
-			<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jy' ); ?>" target="_blank">
-				<?php
+
+		<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/jy' ); ?>" target="_blank"><?php
 				/* translators: %s expands to Yoast SEO Premium */
 				printf( esc_html__( 'Upgrade to %s', 'wordpress-seo' ), 'Yoast SEO Premium' );
 				// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Reason: $new_tab_message is properly escaped.
 				echo $new_tab_message;
-				?>
-			</a>
-		</p>
+				?></a>
 	</div>
 </aside>
diff --git a/admin/views/tabs/dashboard/dashboard.php b/admin/views/tabs/dashboard/dashboard.php
index a73a50cdbae..137f34d0539 100644
--- a/admin/views/tabs/dashboard/dashboard.php
+++ b/admin/views/tabs/dashboard/dashboard.php
@@ -25,20 +25,21 @@
 
 ?>
 
-	<div class="tab-block">
-
-		<div class="yoast-paper">
-			<?php require WPSEO_PATH . 'admin/views/partial-notifications-errors.php'; ?>
-		</div>
+<div class="tab-block">
+	<div class="yoast-paper">
+		<?php require WPSEO_PATH . 'admin/views/partial-notifications-errors.php'; ?>
+	</div>
 
 	<div class="yoast-paper">
 		<?php require WPSEO_PATH . 'admin/views/partial-notifications-warnings.php'; ?>
 	</div>
 </div>
 
-	<div class="tab-block">
+<div class="tab-block">
+	<div class="yoast-paper">
 		<h2><?php esc_html_e( 'Credits', 'wordpress-seo' ); ?></h2>
 		<p>
 			<a href="<?php WPSEO_Shortlinker::show( 'https://yoa.st/yoast-seo-credits' ); ?>"><?php echo esc_html( $wpseo_contributors_phrase ); ?></a>
 		</p>
 	</div>
+</div>
diff --git a/admin/views/tabs/dashboard/features.php b/admin/views/tabs/dashboard/features.php
index 73b69081958..0a58b729eab 100644
--- a/admin/views/tabs/dashboard/features.php
+++ b/admin/views/tabs/dashboard/features.php
@@ -17,8 +17,8 @@
 $yoast_features = new WPSEO_Features();
 
 ?>
-<h2><?php esc_html_e( 'Features', 'wordpress-seo' ); ?></h2>
-<div class="yoast-feature">
+<div class="yoast-paper">
+	<h2><?php esc_html_e( 'Features', 'wordpress-seo' ); ?></h2>
 	<p>
 		<?php
 		printf(
diff --git a/admin/views/tabs/dashboard/webmaster-tools.php b/admin/views/tabs/dashboard/webmaster-tools.php
index 76111555bb4..1818a100da6 100644
--- a/admin/views/tabs/dashboard/webmaster-tools.php
+++ b/admin/views/tabs/dashboard/webmaster-tools.php
@@ -17,7 +17,7 @@
 	'https://yoa.st/3yn',
 	esc_html__( 'Learn more about the Webmaster Tools verification', 'wordpress-seo' )
 );
-echo '<div class="tab-block yoast-feature">';
+echo '<div class="tab-block yoast-paper">';
 echo '<h2 class="help-button-inline">' . esc_html__( 'Webmaster Tools verification', 'wordpress-seo' ) . $webmaster_tools_help . '</h2>';
 
 $msverify_link = 'https://www.bing.com/toolbox/webmaster/#/Dashboard/?url=' .
@@ -32,9 +32,7 @@
 	'https://www.google.com/webmasters/verification/verification'
 );
 
-$yform->textinput( 'baiduverify', __( 'Baidu verification code', 'wordpress-seo' ) );
-echo '<p>';
-printf(
+$context = '<p>' . sprintf(
 	/* translators: %1$s expands to a link start tag to the Baidu Webmaster Tools site add page, %2$s is the link closing tag. */
 	esc_html__( 'Get your Baidu verification code in %1$sBaidu Webmaster Tools%2$s.', 'wordpress-seo' ),
 	/**
@@ -44,36 +42,33 @@
 	 */
 	'<a target="_blank" href="' . esc_url( 'https://ziyuan.baidu.com/site/siteadd' ) . '" rel="noopener noreferrer">',
 	'</a>'
-);
-echo '</p>';
+) . '</p>';
+$yform->textinput( 'baiduverify', __( 'Baidu verification code', 'wordpress-seo' ), [ 'html_after' => $context ] );
+
 
-$yform->textinput( 'msverify', __( 'Bing verification code', 'wordpress-seo' ) );
-echo '<p>';
-printf(
+$context = '<p>' .
+sprintf(
 	/* translators: 1: link open tag; 2: link close tag. */
 	esc_html__( 'Get your Bing verification code in %1$sBing Webmaster Tools%2$s.', 'wordpress-seo' ),
 	'<a target="_blank" href="' . esc_url( $msverify_link ) . '" rel="noopener noreferrer">',
 	'</a>'
-);
-echo '</p>';
+) . '</p>';
+$yform->textinput( 'msverify', __( 'Bing verification code', 'wordpress-seo' ), [ 'html_after' => $context ] );
 
-$yform->textinput( 'googleverify', __( 'Google verification code', 'wordpress-seo' ) );
-echo '<p>';
-printf(
+$context = '<p>' . sprintf(
 	/* translators: 1: link open tag; 2: link close tag. */
 	esc_html__( 'Get your Google verification code in %1$sGoogle Search Console%2$s.', 'wordpress-seo' ),
 	'<a target="_blank" href="' . esc_url( $googleverify_link ) . '" rel="noopener noreferrer">',
 	'</a>'
-);
-echo '</p>';
+) . '</p>';
+$yform->textinput( 'googleverify', __( 'Google verification code', 'wordpress-seo' ), [ 'html_after' => $context ] );
 
-$yform->textinput( 'yandexverify', __( 'Yandex verification code', 'wordpress-seo' ) );
-echo '<p>';
-printf(
+$context = '<p>' . sprintf(
 	/* translators: 1: link open tag; 2: link close tag. */
 	esc_html__( 'Get your Yandex verification code in %1$sYandex Webmaster Tools%2$s.', 'wordpress-seo' ),
 	'<a target="_blank" href="' . esc_url( 'https://webmaster.yandex.com/sites/add/' ) . '" rel="noopener noreferrer">',
 	'</a>'
-);
-echo '</p>';
+) . '</p>';
+$yform->textinput( 'yandexverify', __( 'Yandex verification code', 'wordpress-seo' ), [ 'html_after' => $context ] );
+
 echo '</div>';
diff --git a/admin/views/tabs/metas/archives.php b/admin/views/tabs/metas/archives.php
index 16d96ff6304..85ef0a66d9a 100644
--- a/admin/views/tabs/metas/archives.php
+++ b/admin/views/tabs/metas/archives.php
@@ -38,7 +38,7 @@
 		__DIR__ . '/' . $wpseo_archive['view_file'],
 		[
 			'collapsible'                  => true,
-			'expanded'                     => ( $wpseo_archive_index === 0 ),
+			'expanded'                     => false,
 			'paper_id'                     => $wpseo_archive['paper_id'],
 			'recommended_replace_vars'     => $recommended_replace_vars,
 			'editor_specific_replace_vars' => $editor_specific_replace_vars,
diff --git a/admin/views/tabs/metas/breadcrumbs.php b/admin/views/tabs/metas/breadcrumbs.php
index 9458d3db66f..6f6e6686031 100644
--- a/admin/views/tabs/metas/breadcrumbs.php
+++ b/admin/views/tabs/metas/breadcrumbs.php
@@ -11,7 +11,7 @@
 	exit();
 }
 
-$wpseo_breadcrumbs_presenter = new WPSEO_Collapsible_Presenter(
+$wpseo_breadcrumbs_presenter = new WPSEO_Paper_Presenter(
 	esc_html__( 'Breadcrumbs settings', 'wordpress-seo' ),
 	__DIR__ . '/paper-content/breadcrumbs-content.php',
 	[
diff --git a/admin/views/tabs/metas/paper-content/author-archive-settings.php b/admin/views/tabs/metas/paper-content/author-archive-settings.php
index 0daa6eaaacb..3895b9a5b6e 100644
--- a/admin/views/tabs/metas/paper-content/author-archive-settings.php
+++ b/admin/views/tabs/metas/paper-content/author-archive-settings.php
@@ -10,19 +10,13 @@
 $yform->light_switch(
 	'disable-author',
 	__( 'Author archives', 'wordpress-seo' ),
-	[
-		__( 'Enabled', 'wordpress-seo' ),
-		__( 'Disabled', 'wordpress-seo' ),
-	],
+	[],
 	false,
 	true
 );
 
-?>
-
-<div id='author-archives-titles-metas-content' class='archives-titles-metas-content'>
+echo '<div id="author-archives-titles-metas-content" class="archives-titles-metas-content">';
 
-<?php
 $author_archives_help = new WPSEO_Admin_Help_Button(
 	'https://yoa.st/show-x',
 	esc_html__( 'Help on the author archives search results setting', 'wordpress-seo' )
@@ -34,10 +28,7 @@
 	$author_archives_help
 );
 
-?>
-
-<div id='noindex-author-noposts-wpseo-container'>
-<?php
+echo '<div id="noindex-author-noposts-wpseo-container">';
 
 $author_archives_no_posts_help = new WPSEO_Admin_Help_Button(
 	'https://yoast.com/show-x-in-search-results/',
@@ -50,10 +41,7 @@
 	$author_archives_no_posts_help
 );
 
-?>
-</div>
-
-<?php
+echo '</div>'; // noindex-container.
 
 $recommended_replace_vars     = new WPSEO_Admin_Recommended_Replace_Vars();
 $editor_specific_replace_vars = new WPSEO_Admin_Editor_Specific_Replace_Vars();
@@ -69,5 +57,5 @@
 );
 
 $editor->render();
-?>
-</div>
+
+echo '</div>'; // author-archives.
diff --git a/admin/views/tabs/metas/paper-content/breadcrumbs-content.php b/admin/views/tabs/metas/paper-content/breadcrumbs-content.php
index 7c01562ae61..59fc1cfcbcb 100644
--- a/admin/views/tabs/metas/paper-content/breadcrumbs-content.php
+++ b/admin/views/tabs/metas/paper-content/breadcrumbs-content.php
@@ -23,7 +23,10 @@
 echo '<br/>';
 
 if ( get_option( 'show_on_front' ) === 'page' && get_option( 'page_for_posts' ) > 0 ) {
-	$yform->show_hide_switch( 'breadcrumbs-display-blog-page', __( 'Show Blog page', 'wordpress-seo' ) );
+	$yform->show_hide_switch(
+		'breadcrumbs-display-blog-page',
+		__( 'Show Blog page', 'wordpress-seo' )
+	);
 }
 
 $yoast_free_breadcrumb_bold_texts = [
@@ -33,7 +36,7 @@
 $yform->light_switch( 'breadcrumbs-boldlast',
 __( 'Bold the last page', 'wordpress-seo' ), $yoast_free_breadcrumb_bold_texts );
 
-echo '<br/><br/>';
+echo '<br/>';
 
 /*
  * WPSEO_Post_Type::get_accessible_post_types() should *not* be used here.
@@ -61,7 +64,6 @@
 	}
 	unset( $pt );
 }
-echo '<br/>';
 
 $taxonomies = get_taxonomies(
 	[
@@ -94,8 +96,9 @@
 unset( $taxonomies, $post_types );
 
 ?>
-<br class="clear"/>
+<br><br>
 </div>
+
 <h2><?php esc_html_e( 'How to insert breadcrumbs in your theme', 'wordpress-seo' ); ?></h2>
 <p>
 	<?php
diff --git a/admin/views/tabs/metas/paper-content/date-archives-settings.php b/admin/views/tabs/metas/paper-content/date-archives-settings.php
index 9e9aaf9c903..ed0c2a9a005 100644
--- a/admin/views/tabs/metas/paper-content/date-archives-settings.php
+++ b/admin/views/tabs/metas/paper-content/date-archives-settings.php
@@ -10,41 +10,42 @@
 $yform->light_switch(
 	'disable-date',
 	__( 'Date archives', 'wordpress-seo' ),
-	[
-		__( 'Enabled', 'wordpress-seo' ),
-		__( 'Disabled', 'wordpress-seo' ),
-	],
+	[],
 	false,
 	true
 );
 
-?>
-<div id='date-archives-titles-metas-content' class='archives-titles-metas-content'>
-	<?php
-	$date_archives_help = new WPSEO_Admin_Help_Button(
-		'https://yoa.st/show-x',
-		esc_html__( 'Help on the date archives search results setting', 'wordpress-seo' )
-	);
-
-	$yform->index_switch(
-		'noindex-archive-wpseo',
-		__( 'date archives', 'wordpress-seo' ),
-		$date_archives_help
-	);
-
-	$recommended_replace_vars     = new WPSEO_Admin_Recommended_Replace_Vars();
-	$editor_specific_replace_vars = new WPSEO_Admin_Editor_Specific_Replace_Vars();
-
-	$editor = new WPSEO_Replacevar_Editor(
-		$yform,
-		[
-			'title'                 => 'title-archive-wpseo',
-			'description'           => 'metadesc-archive-wpseo',
-			'page_type_recommended' => $recommended_replace_vars->determine_for_archive( 'date' ),
-			'page_type_specific'    => $editor_specific_replace_vars->determine_for_archive( 'date' ),
-			'paper_style'           => false,
-		]
-	);
-	$editor->render();
-	?>
-</div>
+echo '<div id="date-archives-titles-metas-content" class="archives-titles-metas-content">';
+
+echo '<div class="yoast-space-after">';
+
+$date_archives_help = new WPSEO_Admin_Help_Button(
+	'https://yoa.st/show-x',
+	esc_html__( 'Help on the date archives search results setting', 'wordpress-seo' )
+);
+
+$yform->index_switch(
+	'noindex-archive-wpseo',
+	__( 'date archives', 'wordpress-seo' ),
+	$date_archives_help
+);
+
+echo '</div>'; // space-after.
+
+$recommended_replace_vars     = new WPSEO_Admin_Recommended_Replace_Vars();
+$editor_specific_replace_vars = new WPSEO_Admin_Editor_Specific_Replace_Vars();
+
+$editor = new WPSEO_Replacevar_Editor(
+	$yform,
+	[
+		'title'                 => 'title-archive-wpseo',
+		'description'           => 'metadesc-archive-wpseo',
+		'page_type_recommended' => $recommended_replace_vars->determine_for_archive( 'date' ),
+		'page_type_specific'    => $editor_specific_replace_vars->determine_for_archive( 'date' ),
+		'paper_style'           => false,
+	]
+);
+$editor->render();
+
+echo '</div>'; // archives-content.
+
diff --git a/admin/views/tabs/metas/paper-content/general/force-rewrite-title.php b/admin/views/tabs/metas/paper-content/general/force-rewrite-title.php
index fb9a36d0667..98b82676d37 100644
--- a/admin/views/tabs/metas/paper-content/general/force-rewrite-title.php
+++ b/admin/views/tabs/metas/paper-content/general/force-rewrite-title.php
@@ -9,7 +9,7 @@
 
 if ( ! current_theme_supports( 'title-tag' ) ) {
 	?>
-	<div class="tab-block yoast-feature">
+	<div class="tab-block yoast-paper">
 		<?php
 		$yform->light_switch( 'forcerewritetitle', __( 'Force rewrite titles', 'wordpress-seo' ) );
 		echo '<p class="description">';
diff --git a/admin/views/tabs/metas/paper-content/general/homepage.php b/admin/views/tabs/metas/paper-content/general/homepage.php
index 333f66279e5..856d7d1d3bb 100644
--- a/admin/views/tabs/metas/paper-content/general/homepage.php
+++ b/admin/views/tabs/metas/paper-content/general/homepage.php
@@ -8,7 +8,7 @@
  */
 
 ?>
-<div class="tab-block yoast-feature">
+<div class="tab-block yoast-paper yoast-space-after">
 	<div class="yoast-field-group">
 	<?php
 	if ( get_option( 'show_on_front' ) === 'posts' ) {
@@ -54,5 +54,4 @@
 	}
 	?>
 	</div>
-	<br class="clear">
 </div>
diff --git a/admin/views/tabs/metas/paper-content/general/knowledge-graph.php b/admin/views/tabs/metas/paper-content/general/knowledge-graph.php
index eea37567df5..84e2b3d30d5 100644
--- a/admin/views/tabs/metas/paper-content/general/knowledge-graph.php
+++ b/admin/views/tabs/metas/paper-content/general/knowledge-graph.php
@@ -12,7 +12,7 @@
 	__( 'Learn more about the knowledge graph setting', 'wordpress-seo' )
 );
 ?>
-<div class="tab-block yoast-feature">
+<div class="tab-block yoast-paper yoast-space-after yoast-space-bottom">
 	<h2 class="help-button-inline"><?php echo esc_html__( 'Knowledge Graph & Schema.org', 'wordpress-seo' ) . $knowledge_graph_help; ?></h2>
 	<?php
 	/**
@@ -33,9 +33,16 @@
 		'company' => __( 'Organization', 'wordpress-seo' ),
 		'person'  => __( 'Person', 'wordpress-seo' ),
 	];
-	$yform->select( 'company_or_person', __( 'Organization or person', 'wordpress-seo' ), $yoast_free_kg_select_options, 'styled', false );
+
+	$yform->radio(
+		'company_or_person',
+		$yoast_free_kg_select_options,
+		__( 'Organization or person', 'wordpress-seo' )
+	);
 	?>
+	<br>
 	<div id="knowledge-graph-company">
+		<h3><?php esc_html_e( 'Organization', 'wordpress-seo' ); ?></h3>
 		<?php
 
 		/*
@@ -46,11 +53,9 @@
 		$yoast_seo_company_logo = WPSEO_Options::get( 'company_logo', '' );
 		if ( empty( $yoast_seo_company_name ) || empty( $yoast_seo_company_logo ) ) :
 			?>
-		<div id="knowledge-graph-company-warning"></div>
-		<?php endif; ?>
+			<div id="knowledge-graph-company-warning"></div>
+		<?php endif;
 
-		<h3><?php esc_html_e( 'Organization', 'wordpress-seo' ); ?></h3>
-		<?php
 		$yform->textinput( 'company_name', __( 'Organization name', 'wordpress-seo' ), [ 'autocomplete' => 'organization' ] );
 		$yform->media_input( 'company_logo', __( 'Organization logo', 'wordpress-seo' ) );
 		?>
diff --git a/admin/views/tabs/metas/paper-content/general/title-separator.php b/admin/views/tabs/metas/paper-content/general/title-separator.php
index 154549c6b69..37bb11c9689 100644
--- a/admin/views/tabs/metas/paper-content/general/title-separator.php
+++ b/admin/views/tabs/metas/paper-content/general/title-separator.php
@@ -12,7 +12,7 @@
 	__( 'Learn more about the title separator setting', 'wordpress-seo' )
 );
 ?>
-<div class="tab-block yoast-feature">
+<div class="tab-block yoast-paper yoast-space-after yoast-space-bottom">
 	<fieldset class="yoast-field-group">
 		<h2 class="help-button-inline"><?php echo esc_html__( 'Title Separator', 'wordpress-seo' ) . $title_separator_help; ?></h2>
 		<?php
@@ -21,5 +21,4 @@
 		$yform->title_separator( 'separator', WPSEO_Option_Titles::get_instance()->get_separator_options_for_display(), $legend, $legend_attr );
 		?>
 	</fieldset>
-	<br class="clear">
 </div>
diff --git a/admin/views/tabs/metas/paper-content/media-content.php b/admin/views/tabs/metas/paper-content/media-content.php
index 6e74b7c7780..3e944c1a602 100644
--- a/admin/views/tabs/metas/paper-content/media-content.php
+++ b/admin/views/tabs/metas/paper-content/media-content.php
@@ -18,21 +18,23 @@
 );
 
 ?>
-<div class="yoast-feature">
+<div class="yoast-paper">
 	<h2 class="help-button-inline"><?php echo esc_html__( 'Media & attachment URLs', 'wordpress-seo' ) . $media_attachment_help; ?></h2>
 
-	<p><strong><?php esc_html_e( 'We recommend you set this to Yes.', 'wordpress-seo' ); ?></strong></p>
+	<p><?php printf(
+		esc_html__( 'We recommend you set this to %1$sYes%2$s.', 'wordpress-seo' ),
+		'<strong>',
+		'</strong>'
+		); ?></p>
 	<?php
 
-	$yoast_free_disable_attachments_texts = [
-		__( 'No', 'wordpress-seo' ),
-		__( 'Yes', 'wordpress-seo' ),
-	];
 	$yform->light_switch(
 		'disable-attachment',
 		__( 'Redirect attachment URLs to the attachment itself?', 'wordpress-seo' ),
-		$yoast_free_disable_attachments_texts,
-		false
+		[
+			__( 'No', 'wordpress-seo' ),
+			__( 'Yes', 'wordpress-seo' ),
+		]
 	);
 
 	?>
diff --git a/admin/views/tabs/metas/paper-content/post-type-archive-content.php b/admin/views/tabs/metas/paper-content/post-type-archive-content.php
new file mode 100644
index 00000000000..11003336264
--- /dev/null
+++ b/admin/views/tabs/metas/paper-content/post-type-archive-content.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin\Views\Taxonomies
+ *
+ * @uses Yoast_Form                               $yform                        Form object.
+ * @uses WP_Post_Type                             $wpseo_post_type
+ * @uses Yoast_View_Utils                         $view_utils
+ * @uses WPSEO_Admin_Recommended_Replace_Vars     $recommended_replace_vars
+ * @uses WPSEO_Admin_Editor_Specific_Replace_Vars $editor_specific_replace_vars
+ */
+
+$single_label = $wpseo_post_type->labels->singular_name;
+$paper_style  = false;
+$has_archive  = WPSEO_Post_Type::has_archive( $wpseo_post_type );
+
+
+$plural_label = $wpseo_post_type->labels->name;
+
+$yform->index_switch(
+	'noindex-ptarchive-' . $wpseo_post_type->name,
+	sprintf(
+	/* translators: %s expands to the post type's name. */
+		__( 'the archive for %s', 'wordpress-seo' ),
+		$plural_label
+	),
+	$view_utils->search_results_setting_help()
+);
+
+$page_type = $recommended_replace_vars->determine_for_archive( $wpseo_post_type->name );
+
+$editor = new WPSEO_Replacevar_Editor(
+	$yform,
+	[
+		'title'                 => 'title-ptarchive-' . $wpseo_post_type->name,
+		'description'           => 'metadesc-ptarchive-' . $wpseo_post_type->name,
+		'page_type_recommended' => $recommended_replace_vars->determine_for_archive( $wpseo_post_type->name ),
+		'page_type_specific'    => $editor_specific_replace_vars->determine_for_archive( $wpseo_post_type->name ),
+		'paper_style'           => false,
+	]
+);
+$editor->render();
+
+if ( WPSEO_Options::get( 'breadcrumbs-enable' ) === true ) {
+	echo '<h3>' . __( 'Breadcrumb settings', 'wordpress-seo' ) . '</h3>';
+	$yform->textinput( 'bctitle-ptarchive-' . $wpseo_post_type->name, __( 'Breadcrumbs title', 'wordpress-seo' ) );
+}
diff --git a/admin/views/tabs/metas/paper-content/post-type-content.php b/admin/views/tabs/metas/paper-content/post-type-content.php
index 53e63467c3e..a3c284d53ec 100644
--- a/admin/views/tabs/metas/paper-content/post-type-content.php
+++ b/admin/views/tabs/metas/paper-content/post-type-content.php
@@ -13,9 +13,7 @@
 
 $single_label = $wpseo_post_type->labels->singular_name;
 $paper_style  = false;
-
-/* translators: %s is the singular version of the post type's name. */
-echo '<h3>' . esc_html( sprintf( __( 'Settings for single %s URLs', 'wordpress-seo' ), $wpseo_post_type->labels->singular_name ) ) . '</h3>';
+$has_archive  = WPSEO_Post_Type::has_archive( $wpseo_post_type );
 
 require __DIR__ . '/post_type/post-type.php';
 
@@ -25,43 +23,6 @@
 	return;
 }
 
-if ( WPSEO_Post_Type::has_archive( $wpseo_post_type ) ) {
-	$plural_label = $wpseo_post_type->labels->name;
-
-	/* translators: %s is the plural version of the post type's name. */
-	echo '<h3>' . esc_html( sprintf( __( 'Settings for %s archive', 'wordpress-seo' ), $plural_label ) ) . '</h3>';
-
-	$yform->index_switch(
-		'noindex-ptarchive-' . $wpseo_post_type->name,
-		sprintf(
-			/* translators: %s expands to the post type's name. */
-			__( 'the archive for %s', 'wordpress-seo' ),
-			$plural_label
-		),
-		$view_utils->search_results_setting_help()
-	);
-
-	$page_type = $recommended_replace_vars->determine_for_archive( $wpseo_post_type->name );
-
-	$editor = new WPSEO_Replacevar_Editor(
-		$yform,
-		[
-			'title'                 => 'title-ptarchive-' . $wpseo_post_type->name,
-			'description'           => 'metadesc-ptarchive-' . $wpseo_post_type->name,
-			'page_type_recommended' => $recommended_replace_vars->determine_for_archive( $wpseo_post_type->name ),
-			'page_type_specific'    => $editor_specific_replace_vars->determine_for_archive( $wpseo_post_type->name ),
-			'paper_style'           => false,
-		]
-	);
-	$editor->render();
-
-	if ( WPSEO_Options::get( 'breadcrumbs-enable' ) === true ) {
-		/* translators: %s is the plural version of the post type's name. */
-		echo '<h3>' . esc_html( sprintf( __( 'Breadcrumb settings for %s archive', 'wordpress-seo' ), $plural_label ) ) . '</h3>';
-		$yform->textinput( 'bctitle-ptarchive-' . $wpseo_post_type->name, __( 'Breadcrumbs title', 'wordpress-seo' ) );
-	}
-}
-
 /**
  * Allow adding a custom checkboxes to the admin meta page - Post Types tab.
  *
diff --git a/admin/views/tabs/metas/paper-content/post_type/post-type.php b/admin/views/tabs/metas/paper-content/post_type/post-type.php
index e7abee5bd5e..0ffb3a69d3d 100644
--- a/admin/views/tabs/metas/paper-content/post_type/post-type.php
+++ b/admin/views/tabs/metas/paper-content/post_type/post-type.php
@@ -21,7 +21,7 @@
 
 $yform->show_hide_switch(
 	'showdate-' . $wpseo_post_type->name,
-	__( 'Date in Google Preview', 'wordpress-seo' )
+	__( 'Show date in Google Preview', 'wordpress-seo' )
 );
 
 $yform->show_hide_switch(
diff --git a/admin/views/tabs/metas/paper-content/rss-content.php b/admin/views/tabs/metas/paper-content/rss-content.php
index 5cfcfaf72a8..b83bcbac052 100644
--- a/admin/views/tabs/metas/paper-content/rss-content.php
+++ b/admin/views/tabs/metas/paper-content/rss-content.php
@@ -7,6 +7,15 @@
  * @uses Yoast_Form $yform Form object.
  */
 
+echo '<div class="yoast-paper yoast-space-after yoast-space-bottom">';
+
+$rss_help = new WPSEO_Admin_Help_Button(
+	'https://yoa.st/3ym',
+	__( 'Learn more about the RSS feed setting', 'wordpress-seo' )
+);
+
+echo '<h2 class="help-button-inline">' . esc_html__( 'RSS feed settings', 'wordpress-seo' ) . $rss_help . '</h2>';
+
 $textarea_atts = [
 	'cols' => '50',
 	'rows' => '5',
@@ -19,9 +28,13 @@
 	__( 'Learn more about the available variables', 'wordpress-seo' )
 );
 
+echo '</div>'; // yoast-paper.
+
+echo '<div class="yoast-paper yoast-space-bottom">';
+
 echo '<h2 class="help-button-inline">' . esc_html__( 'Available variables', 'wordpress-seo' ) . $rss_variables_help . '</h2>';
 ?>
-<table class="wpseo yoast_help yoast-table yoast-table-scrollable widefat striped">
+<table class="wpseo yoast_help yoast-table widefat striped">
 	<thead>
 	<tr>
 		<th scope="col"><?php esc_html_e( 'Variable', 'wordpress-seo' ); ?></th>
@@ -47,3 +60,5 @@
 	</tr>
 	</tbody>
 </table>
+
+</div>
diff --git a/admin/views/tabs/metas/paper-content/special-pages.php b/admin/views/tabs/metas/paper-content/special-pages.php
index d839a5bcaf8..63f78d0392e 100644
--- a/admin/views/tabs/metas/paper-content/special-pages.php
+++ b/admin/views/tabs/metas/paper-content/special-pages.php
@@ -21,7 +21,7 @@
 $editor = new WPSEO_Replacevar_Field( $yform, 'title-search-wpseo', __( 'Search pages', 'wordpress-seo' ), 'search', 'search' );
 $editor->render();
 
-echo '<br/>';
-
 $editor = new WPSEO_Replacevar_Field( $yform, 'title-404-wpseo', __( '404 pages', 'wordpress-seo' ), '404', '404' );
 $editor->render();
+
+echo '<br class="clear">';
diff --git a/admin/views/tabs/metas/paper-content/taxonomy-content.php b/admin/views/tabs/metas/paper-content/taxonomy-content.php
index db57feb97f3..ac1800b26b0 100644
--- a/admin/views/tabs/metas/paper-content/taxonomy-content.php
+++ b/admin/views/tabs/metas/paper-content/taxonomy-content.php
@@ -16,7 +16,7 @@
 	$yform->light_switch(
 		'disable-post_format',
 		__( 'Format-based archives', 'wordpress-seo' ),
-		[ __( 'Enabled', 'wordpress-seo' ), __( 'Disabled', 'wordpress-seo' ) ],
+		[],
 		false,
 		true
 	);
@@ -30,6 +30,13 @@
 	$view_utils->search_results_setting_help()
 );
 
+if ( $wpseo_taxonomy->name !== 'post_format' ) {
+	$yform->show_hide_switch(
+		'display-metabox-tax-' . $wpseo_taxonomy->name,
+		/* translators: %s expands to an indexable object's name, like a post type or taxonomy */
+		sprintf( __( 'Show SEO settings for %1$s', 'wordpress-seo' ), $title )
+	);
+}
 
 // Determine the page type for the term, this is needed for the recommended replacement variables.
 $page_type = $recommended_replace_vars->determine_for_term( $wpseo_taxonomy->name );
@@ -46,14 +53,6 @@
 );
 $editor->render();
 
-if ( $wpseo_taxonomy->name !== 'post_format' ) {
-	$yform->show_hide_switch(
-		'display-metabox-tax-' . $wpseo_taxonomy->name,
-		/* translators: %s expands to an indexable object's name, like a post type or taxonomy */
-		sprintf( __( 'Show SEO settings for %1$s', 'wordpress-seo' ), $title )
-	);
-}
-
 /**
  * Allow adding custom checkboxes to the admin meta page - Taxonomies tab.
  *
diff --git a/admin/views/tabs/metas/post-types.php b/admin/views/tabs/metas/post-types.php
index 50c569c66d5..2360c05a156 100644
--- a/admin/views/tabs/metas/post-types.php
+++ b/admin/views/tabs/metas/post-types.php
@@ -32,7 +32,7 @@
 			__DIR__ . '/paper-content/post-type-content.php',
 			[
 				'collapsible' => true,
-				'expanded'    => ( $wpseo_post_type_index === 0 ),
+				'expanded'    => false,
 				'paper_id'    => 'settings-' . $post_type->name,
 				'view_data'   => [
 					'wpseo_post_type'              => $post_type,
@@ -47,5 +47,34 @@
 		);
 
 		echo $wpseo_post_type_presenter->get_output();
+
+		// We're done if there is no archive.
+		if ( ! WPSEO_Post_Type::has_archive( $post_type ) ) {
+			continue;
+		}
+
+		/* translators: %s is the plural version of the post type's name. */
+		$label = sprintf( __( '%1$s archives', 'wordpress-seo' ), $post_type->labels->name );
+
+		$wpseo_post_type_archive_presenter = new WPSEO_Collapsible_Presenter(
+			$label,
+			__DIR__ . '/paper-content/post-type-archive-content.php',
+			[
+				'collapsible' => true,
+				'expanded'    => false,
+				'paper_id'    => 'archive-settings-' . $post_type->name,
+				'view_data'   => [
+					'wpseo_post_type'              => $post_type,
+					'view_utils'                   => $view_utils,
+					'recommended_replace_vars'     => $recommended_replace_vars,
+					'editor_specific_replace_vars' => $editor_specific_replace_vars,
+				],
+				'title'       => $label,
+				'title_after' => ' (<code>' . esc_html( $post_type->name ) . '</code>)',
+				'class'       => 'search-appearance',
+			]
+		);
+
+		echo $wpseo_post_type_archive_presenter->get_output();
 	}
 }
diff --git a/admin/views/tabs/metas/taxonomies.php b/admin/views/tabs/metas/taxonomies.php
index d53edc08da5..f604ede5404 100644
--- a/admin/views/tabs/metas/taxonomies.php
+++ b/admin/views/tabs/metas/taxonomies.php
@@ -26,7 +26,7 @@
 			__DIR__ . '/paper-content/taxonomy-content.php',
 			[
 				'collapsible' => true,
-				'expanded'    => ( $wpseo_taxonomy_index === 0 ),
+				'expanded'    => false,
 				'paper_id'    => 'settings-' . $wpseo_taxonomy->name,
 				'view_data'   => [
 					'wpseo_taxonomy'               => $wpseo_taxonomy,
@@ -46,7 +46,14 @@
 
 unset( $wpseo_taxonomies );
 
-echo '<div class="yoast-feature">';
-printf( '<h2>%s</h2>', esc_html__( 'Category URLs', 'wordpress-seo' ) );
-require __DIR__ . '/taxonomies/category-url.php';
-echo '</div>';
+
+$wpseo_taxonomy_presenter = new WPSEO_Collapsible_Presenter(
+	__( 'Category URLs', 'wordpress-seo' ),
+	__DIR__ . '/taxonomies/category-url.php',
+	[
+		'collapsible' => true,
+		'expanded'    => false,
+		'paper_id'    => 'taxonomies-category-urls',
+	]
+);
+echo $wpseo_taxonomy_presenter->get_output();
diff --git a/admin/views/tabs/social/accounts.php b/admin/views/tabs/social/accounts.php
index 1db14efb6dc..e1b81f4f5be 100644
--- a/admin/views/tabs/social/accounts.php
+++ b/admin/views/tabs/social/accounts.php
@@ -12,7 +12,7 @@
 	header( 'HTTP/1.1 403 Forbidden' );
 	exit();
 }
-echo '<div class="tab-block yoast-feature">';
+echo '<div class="tab-block yoast-paper yoast-space-bottom">';
 $social_profiles_help = new WPSEO_Admin_Help_Button(
 	'https://yoa.st/3yo',
 	__( 'Learn more about your social profiles settings', 'wordpress-seo' )
@@ -103,4 +103,5 @@
 }
 
 do_action( 'wpseo_admin_other_section' );
+
 echo '</div>';
diff --git a/admin/views/tabs/social/facebook.php b/admin/views/tabs/social/facebook.php
index 60069bdd706..71f7892cd9f 100644
--- a/admin/views/tabs/social/facebook.php
+++ b/admin/views/tabs/social/facebook.php
@@ -12,7 +12,7 @@
 	header( 'HTTP/1.1 403 Forbidden' );
 	exit();
 }
-echo '<div class="tab-block yoast-feature">';
+echo '<div class="tab-block yoast-paper">';
 echo '<h2>' . esc_html__( 'Facebook settings', 'wordpress-seo' ) . '</h2>';
 printf(
 	'<p>%s</p>',
@@ -62,6 +62,7 @@
 $yform->media_input( 'og_default_image', __( 'Image URL', 'wordpress-seo' ) );
 
 ?>
+	<br>
 	<p class="desc label">
 		<?php esc_html_e( 'This image is used if the post/page being shared does not contain any images.', 'wordpress-seo' ); ?>
 	</p>
diff --git a/admin/views/tabs/social/pinterest.php b/admin/views/tabs/social/pinterest.php
index 8973ab9b077..37860a6b25f 100644
--- a/admin/views/tabs/social/pinterest.php
+++ b/admin/views/tabs/social/pinterest.php
@@ -13,7 +13,7 @@
 	exit();
 }
 
-echo '<div class="yoast-feature">';
+echo '<div class="yoast-paper yoast-paper--bottom">';
 echo '<h2>' . esc_html__( 'Pinterest settings', 'wordpress-seo' ) . '</h2>';
 
 printf(
diff --git a/admin/views/tabs/social/twitterbox.php b/admin/views/tabs/social/twitterbox.php
index 3a0dc9630b2..73495ce5f7d 100644
--- a/admin/views/tabs/social/twitterbox.php
+++ b/admin/views/tabs/social/twitterbox.php
@@ -13,7 +13,7 @@
 	header( 'HTTP/1.1 403 Forbidden' );
 	exit();
 }
-echo '<div class="yoast-feature">';
+echo '<div class="yoast-paper yoast-paper--bottom">';
 echo '<h2>' . esc_html__( 'Twitter settings', 'wordpress-seo' ) . '</h2>';
 
 printf(
@@ -21,15 +21,23 @@
 	esc_html__( 'Twitter uses Open Graph metadata just like Facebook, so be sure to keep the "Add Open Graph meta data" setting on the Facebook tab enabled if you want to optimize your site for Twitter.', 'wordpress-seo' )
 );
 
-$yform->light_switch( 'twitter', __( 'Add Twitter card meta data', 'wordpress-seo' ) );
-
 echo '<p>';
 esc_html_e( 'Enable this feature if you want Twitter to display a preview with images and a text excerpt when a link to your site is shared.', 'wordpress-seo' );
 echo '</p>';
 
-echo '<br />';
+$yform->light_switch(
+	'twitter',
+	__( 'Twitter card meta data', 'wordpress-seo' )
+);
+
+echo '<div id="wpseo-twitter-settings">';
+$yform->radio(
+	'twitter_card_type',
+	WPSEO_Option_Social::$twitter_card_types,
+	__( 'The default card type to use', 'wordpress-seo' )
+);
+echo '</div>'; // twitter-settings.
 
-$yform->select( 'twitter_card_type', __( 'The default card type to use', 'wordpress-seo' ), WPSEO_Option_Social::$twitter_card_types );
 echo '</div>';
 
 do_action( 'wpseo_admin_twitter_section' );
diff --git a/admin/views/tabs/tool/bulk-editor-table.php b/admin/views/tabs/tool/bulk-editor-table.php
new file mode 100644
index 00000000000..946a732558e
--- /dev/null
+++ b/admin/views/tabs/tool/bulk-editor-table.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin\Views
+ */
+
+if ( ! function_exists( 'wpseo_get_rendered_tab' ) ) {
+	/**
+	 * Renders a bulk editor tab.
+	 *
+	 * @param WPSEO_Bulk_List_Table $table The table to render.
+	 * @param string                $id    The id for the tab.
+	 */
+	function wpseo_get_rendered_tab( $table, $id ) {
+		?>
+		<div id="<?php echo esc_attr( $id ); ?>">
+			<?php
+			$table->show_page();
+			?>
+		</div>
+		<?php
+	}
+}
+
+wpseo_get_rendered_tab( $table, $collapsible_id );
diff --git a/admin/views/tabs/tool/file-editor-htaccess.php b/admin/views/tabs/tool/file-editor-htaccess.php
new file mode 100644
index 00000000000..80a9d2cd70d
--- /dev/null
+++ b/admin/views/tabs/tool/file-editor-htaccess.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin\Views
+ */
+
+if ( file_exists( $ht_access_file ) ) {
+	$f = fopen( $ht_access_file, 'r' );
+
+	$contentht = '';
+	if ( filesize( $ht_access_file ) > 0 ) {
+		$contentht = fread( $f, filesize( $ht_access_file ) );
+	}
+
+	if ( ! is_writable( $ht_access_file ) ) {
+		echo '<p><em>';
+		printf(
+		/* translators: %s expands to ".htaccess". */
+			esc_html__( 'If your %s were writable, you could edit it from here.', 'wordpress-seo' ),
+			'.htaccess'
+		);
+		echo '</em></p>';
+		echo '<textarea class="yoast-field-group__textarea code" disabled="disabled" rows="15" name="robotsnew">', esc_textarea( $contentht ), '</textarea><br/>';
+	}
+	else {
+		echo '<form action="', esc_url( $action_url ), '" method="post" id="htaccessform">';
+		wp_nonce_field( 'wpseo-htaccess', '_wpnonce', true, true );
+		echo '<div class="yoast-field-group__title">';
+		echo '<label for="htaccessnew" class="yoast-inline-label">';
+		printf(
+		/* translators: %s expands to ".htaccess". */
+			esc_html__( 'Edit the content of your %s:', 'wordpress-seo' ),
+			'.htaccess'
+		);
+		echo '</label>';
+		echo '</div>';
+		echo '<textarea class="yoast-field-group__textarea code" rows="15" name="htaccessnew" id="htaccessnew">', esc_textarea( $contentht ), '</textarea><br/>';
+		printf(
+			'<br><p><input class="yoast-button yoast-button--primary" type="submit" name="submithtaccess" value="%s" /></p>',
+			sprintf(
+			/* translators: %s expands to ".htaccess". */
+				esc_attr__( 'Save changes to %s', 'wordpress-seo' ),
+				'.htaccess'
+			)
+		);
+		echo '</form>';
+	}
+}
+else {
+	echo '<p>';
+	printf(
+	/* translators: %s expands to ".htaccess". */
+		esc_html__( 'If you had a %s file and it was editable, you could edit it from here.', 'wordpress-seo' ),
+		'.htaccess'
+	);
+	echo '</p>';
+}
diff --git a/admin/views/tabs/tool/file-editor-robots.php b/admin/views/tabs/tool/file-editor-robots.php
new file mode 100644
index 00000000000..299c2bdabf3
--- /dev/null
+++ b/admin/views/tabs/tool/file-editor-robots.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin\Views
+ */
+
+echo '<div class="yoast-field-group">';
+
+if ( ! file_exists( $robots_file ) ) {
+	if ( is_writable( get_home_path() ) ) {
+		echo '<form action="', esc_url( $action_url ), '" method="post" id="robotstxtcreateform">';
+		wp_nonce_field( 'wpseo_create_robots', '_wpnonce', true, true );
+		echo '<p>';
+		printf(
+		/* translators: %s expands to robots.txt. */
+			esc_html__( 'You don\'t have a %s file, create one here:', 'wordpress-seo' ),
+			'robots.txt'
+		);
+		echo '</p>';
+
+		printf(
+			'<p clas="submit"><input type="submit" class="yoast-button yoast-button--primary" name="create_robots" value="%s"></p>',
+			sprintf(
+			/* translators: %s expands to robots.txt. */
+				esc_attr__( 'Create %s file', 'wordpress-seo' ),
+				'robots.txt'
+			)
+		);
+		echo '</form>';
+	}
+	else {
+		echo '<p>';
+		printf(
+		/* translators: %s expands to robots.txt. */
+			esc_html__( 'If you had a %s file and it was editable, you could edit it from here.', 'wordpress-seo' ),
+			'robots.txt'
+		);
+		echo '</p>';
+	}
+}
+else {
+	$f = fopen( $robots_file, 'r' );
+
+	$content = '';
+	if ( filesize( $robots_file ) > 0 ) {
+		$content = fread( $f, filesize( $robots_file ) );
+	}
+
+	if ( ! is_writable( $robots_file ) ) {
+		echo '<p><em>';
+		printf(
+		/* translators: %s expands to robots.txt. */
+			esc_html__( 'If your %s were writable, you could edit it from here.', 'wordpress-seo' ),
+			'robots.txt'
+		);
+		echo '</em></p>';
+		echo '<textarea class="yoast-field-group__textarea code" disabled="disabled" rows="15" name="robotsnew">', esc_textarea( $content ), '</textarea><br/>';
+	}
+	else {
+		echo '<form action="', esc_url( $action_url ), '" method="post" id="robotstxtform">';
+		wp_nonce_field( 'wpseo-robotstxt', '_wpnonce', true, true );
+		echo '<div class="yoast-field-group__title">';
+		echo '<label for="robotsnew" class="yoast-inline-label">';
+		printf(
+		/* translators: %s expands to robots.txt. */
+			esc_html__( 'Edit the content of your %s:', 'wordpress-seo' ),
+			'robots.txt'
+		);
+		echo '</label>';
+		echo '</div>';
+		echo '<textarea class="yoast-field-group__textarea code" rows="15" name="robotsnew" id="robotsnew">', esc_textarea( $content ), '</textarea><br/>';
+		printf(
+			'<br><p><input class="yoast-button yoast-button--primary" type="submit" name="submitrobots" value="%s" /></p>',
+			sprintf(
+			/* translators: %s expands to robots.txt. */
+				esc_attr__( 'Save changes to %s', 'wordpress-seo' ),
+				'robots.txt'
+			)
+		);
+		echo '</form>';
+	}
+}
+
+echo '</div>'; // yoast-field-group.
diff --git a/admin/views/tabs/tool/import-seo.php b/admin/views/tabs/tool/import-seo.php
index 76e4828718d..fcb6f7e2a79 100644
--- a/admin/views/tabs/tool/import-seo.php
+++ b/admin/views/tabs/tool/import-seo.php
@@ -15,13 +15,13 @@
 $import_check = new WPSEO_Import_Plugins_Detector();
 $import_check->detect();
 if ( count( $import_check->needs_import ) === 0 ) {
-	echo '<h2>', esc_html__( 'Import from other SEO plugins', 'wordpress-seo' ), '</h2>';
 	echo '<p>';
 	printf(
 		/* translators: %s expands to Yoast SEO */
 		esc_html__( '%s did not detect any plugin data from plugins it can import from.', 'wordpress-seo' ),
 		'Yoast SEO'
 	);
+
 	echo '</p>';
 
 	return;
@@ -48,81 +48,78 @@ function wpseo_import_external_select( $name, $plugins ) {
 }
 
 ?>
-<h2><?php esc_html_e( 'Import from other SEO plugins', 'wordpress-seo' ); ?></h2>
-<div class="yoast-feature">
+<p>
+	<?php esc_html_e( 'We\'ve detected data from one or more SEO plugins on your site. Please follow the following steps to import that data:', 'wordpress-seo' ); ?>
+</p>
+
+<div class="tab-block">
+	<h3><?php esc_html_e( 'Step 1: Create a backup', 'wordpress-seo' ); ?></h3>
 	<p>
-		<?php esc_html_e( 'We\'ve detected data from one or more SEO plugins on your site. Please follow the following steps to import that data:', 'wordpress-seo' ); ?>
+		<?php esc_html_e( 'Please make a backup of your database before starting this process.', 'wordpress-seo' ); ?>
 	</p>
+</div>
 
-	<div class="tab-block">
-		<h3><?php esc_html_e( 'Step 1: Create a backup', 'wordpress-seo' ); ?></h3>
-		<p>
-			<?php esc_html_e( 'Please make a backup of your database before starting this process.', 'wordpress-seo' ); ?>
-		</p>
-	</div>
-
-	<div class="tab-block">
-		<h3><?php esc_html_e( 'Step 2: Import', 'wordpress-seo' ); ?></h3>
-		<p>
+<div class="tab-block">
+	<h3><?php esc_html_e( 'Step 2: Import', 'wordpress-seo' ); ?></h3>
+	<p>
+		<?php
+		printf(
+			/* translators: 1: expands to Yoast SEO */
+			esc_html__( 'This will import the post metadata like SEO titles and descriptions into your %1$s metadata. It will only do this when there is no existing %1$s metadata yet. The original data will remain in place.', 'wordpress-seo' ),
+			'Yoast SEO'
+		);
+		?>
+	</p>
+	<form action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#import-seo' ) ); ?>"
+		method="post" accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
+		<div class="yoast-field-group">
+			<?php
+			wp_nonce_field( 'wpseo-import-plugins', '_wpnonce', true, true );
+			wpseo_import_external_select( 'import_external_plugin', $import_check->needs_import );
+			?>
 			<?php
-			printf(
-				/* translators: 1: expands to Yoast SEO */
-				esc_html__( 'This will import the post metadata like SEO titles and descriptions into your %1$s metadata. It will only do this when there is no existing %1$s metadata yet. The original data will remain in place.', 'wordpress-seo' ),
-				'Yoast SEO'
-			);
+			do_action( 'wpseo_import_other_plugins' );
 			?>
-		</p>
-		<form action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#import-seo' ) ); ?>"
-			method="post" accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
-			<div class="yoast-field-group">
-				<?php
-				wp_nonce_field( 'wpseo-import-plugins', '_wpnonce', true, true );
-				wpseo_import_external_select( 'import_external_plugin', $import_check->needs_import );
-				?>
-				<?php
-				do_action( 'wpseo_import_other_plugins' );
-				?>
-				<input type="submit" class="yoast-button yoast-button--primary" name="import_external"
-					value="<?php esc_attr_e( 'Import', 'wordpress-seo' ); ?>"/>
-			</div>
-		</form>
-	</div>
+			<input type="submit" class="yoast-button yoast-button--primary" name="import_external"
+				value="<?php esc_attr_e( 'Import', 'wordpress-seo' ); ?>"/>
+		</div>
+	</form>
+</div>
 
-	<div class="tab-block">
-		<h3><?php esc_html_e( 'Step 3: Check your data', 'wordpress-seo' ); ?></h3>
-		<p>
-			<?php esc_html_e( 'Please check your posts and pages and see if the metadata was successfully imported.', 'wordpress-seo' ); ?>
-		</p>
-	</div>
+<div class="tab-block">
+	<h3><?php esc_html_e( 'Step 3: Check your data', 'wordpress-seo' ); ?></h3>
+	<p>
+		<?php esc_html_e( 'Please check your posts and pages and see if the metadata was successfully imported.', 'wordpress-seo' ); ?>
+	</p>
+</div>
 
-	<div class="tab-block">
-		<h3><?php esc_html_e( 'Step 4: Run the configuration wizard', 'wordpress-seo' ); ?></h3>
-		<p>
+<div class="tab-block">
+	<h3><?php esc_html_e( 'Step 4: Run the configuration wizard', 'wordpress-seo' ); ?></h3>
+	<p>
+		<?php
+		printf(
+			esc_html__( 'You should run the configuration wizard, from the SEO &rarr; General &rarr; Dashboard page, to make sure all the settings for your site are correct.', 'wordpress-seo' ),
+			'<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_dashboard' ) ) . '">',
+			'</a>'
+		);
+		?>
+	</p>
+</div>
+
+<div class="tab-block">
+	<h3><?php esc_html_e( 'Step 5: Clean up', 'wordpress-seo' ); ?></h3>
+	<p>
+		<?php esc_html_e( 'Once you\'re certain your site is OK, you can clean up. This will remove all the original data.', 'wordpress-seo' ); ?>
+	</p>
+	<form action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#import-seo' ) ); ?>"
+		method="post" accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
+		<div class="yoast-field-group">
 			<?php
-			printf(
-				esc_html__( 'You should run the configuration wizard, from the SEO &rarr; General &rarr; Dashboard page, to make sure all the settings for your site are correct.', 'wordpress-seo' ),
-				'<a href="' . esc_url( admin_url( 'admin.php?page=wpseo_dashboard' ) ) . '">',
-				'</a>'
-			);
+			wp_nonce_field( 'wpseo-clean-plugins', '_wpnonce', true, true );
+			wpseo_import_external_select( 'clean_external_plugin', $import_check->needs_import );
 			?>
-		</p>
-	</div>
-
-	<div class="tab-block">
-		<h3><?php esc_html_e( 'Step 5: Clean up', 'wordpress-seo' ); ?></h3>
-		<p>
-			<?php esc_html_e( 'Once you\'re certain your site is OK, you can clean up. This will remove all the original data.', 'wordpress-seo' ); ?>
-		</p>
-		<form action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#import-seo' ) ); ?>"
-			method="post" accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
-			<div class="yoast-field-group">
-				<?php
-				wp_nonce_field( 'wpseo-clean-plugins', '_wpnonce', true, true );
-				wpseo_import_external_select( 'clean_external_plugin', $import_check->needs_import );
-				?>
-				<input type="submit" class="yoast-button yoast-button--primary" name="clean_external"
-					value="<?php esc_attr_e( 'Clean', 'wordpress-seo' ); ?>"/>
-			</div>
-		</form>
-	</div>
+			<input type="submit" class="yoast-button yoast-button--primary" name="clean_external"
+				value="<?php esc_attr_e( 'Clean', 'wordpress-seo' ); ?>"/>
+		</div>
+	</form>
 </div>
diff --git a/admin/views/tabs/tool/wpseo-export.php b/admin/views/tabs/tool/wpseo-export.php
index 47834567124..78c40e58e92 100644
--- a/admin/views/tabs/tool/wpseo-export.php
+++ b/admin/views/tabs/tool/wpseo-export.php
@@ -14,8 +14,6 @@
 /* translators: %1$s expands to Yoast SEO */
 $submit_button_value = sprintf( __( 'Export your %1$s settings', 'wordpress-seo' ), 'Yoast SEO' );
 
-echo '<div class="yoast-feature">';
-
 if ( filter_input( INPUT_POST, 'do_export' ) ) {
 	$export = new WPSEO_Export();
 	$export->export();
@@ -29,15 +27,14 @@
 );
 ?>
 
-	<p><?php echo esc_html( $wpseo_export_phrase ); ?></p>
-	<form
-		action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#wpseo-export' ) ); ?>"
-		method="post"
-		accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
-		<?php wp_nonce_field( WPSEO_Export::NONCE_ACTION ); ?>
-		<input type="hidden" name="do_export" value="1" />
-		<p>
-			<button type="submit" class="yoast-button yoast-button--primary" id="export-button"><?php echo esc_html( $submit_button_value ); ?></button>
-		</p>
-	</form>
-</div>
+<p><?php echo esc_html( $wpseo_export_phrase ); ?></p>
+<form
+	action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#wpseo-export' ) ); ?>"
+	method="post"
+	accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
+	<?php wp_nonce_field( WPSEO_Export::NONCE_ACTION ); ?>
+	<input type="hidden" name="do_export" value="1" />
+	<p>
+		<button type="submit" class="yoast-button yoast-button--primary" id="export-button"><?php echo esc_html( $submit_button_value ); ?></button>
+	</p>
+</form>
diff --git a/admin/views/tabs/tool/wpseo-import.php b/admin/views/tabs/tool/wpseo-import.php
index 88540530b4f..ea4e06a50cb 100644
--- a/admin/views/tabs/tool/wpseo-import.php
+++ b/admin/views/tabs/tool/wpseo-import.php
@@ -16,39 +16,39 @@
 	return;
 }
 ?>
-<div class="yoast-feature">
-	<p id="settings-import-desc">
-		<?php
-		printf(
-			/* translators: 1: expands to Yoast SEO, 2: expands to Import settings. */
-			esc_html__( 'Import settings from another %1$s installation by pasting them here and clicking "%2$s".', 'wordpress-seo' ),
-			'Yoast SEO',
-			esc_html__( 'Import settings', 'wordpress-seo' )
-		);
-		?>
-	</p>
 
-	<form
-		action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#wpseo-import' ) ); ?>"
-		method="post"
-		accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
-		<div class="yoast-field-group">
-			<?php wp_nonce_field( WPSEO_Import_Settings::NONCE_ACTION ); ?>
-			<div class="yoast-field-group__title">
-				<label class="yoast-inline-label" for="settings-import">
-					<?php
-					printf(
-						/* translators: %s expands to Yoast SEO */
-						esc_html__( '%s settings to import:', 'wordpress-seo' ),
-						'Yoast SEO'
-					);
-					?>
-				</label>
-			</div>
-			<textarea id="settings-import" rows="10" cols="140" name="settings_import" class="yoast-field-group__textarea" aria-describedby="settings-import-desc"></textarea>
+<p id="settings-import-desc">
+	<?php
+	printf(
+		/* translators: 1: expands to Yoast SEO, 2: expands to Import settings. */
+		esc_html__( 'Import settings from another %1$s installation by pasting them here and clicking "%2$s".', 'wordpress-seo' ),
+		'Yoast SEO',
+		esc_html__( 'Import settings', 'wordpress-seo' )
+	);
+	?>
+</p>
+
+<form
+	action="<?php echo esc_url( admin_url( 'admin.php?page=wpseo_tools&tool=import-export#top#wpseo-import' ) ); ?>"
+	method="post"
+	accept-charset="<?php echo esc_attr( get_bloginfo( 'charset' ) ); ?>">
+	<div class="yoast-field-group">
+		<?php wp_nonce_field( WPSEO_Import_Settings::NONCE_ACTION ); ?>
+		<div class="yoast-field-group__title">
+			<label class="yoast-inline-label" for="settings-import">
+				<?php
+				printf(
+					/* translators: %s expands to Yoast SEO */
+					esc_html__( '%s settings to import:', 'wordpress-seo' ),
+					'Yoast SEO'
+				);
+				?>
+			</label>
 		</div>
-		<p>
-			<input type="submit" class="yoast-button yoast-button--primary" value="<?php esc_attr_e( 'Import settings', 'wordpress-seo' ); ?>"/>
-		</p>
-	</form>
-</div>
+		<textarea id="settings-import" rows="10" cols="140" name="settings_import" class="yoast-field-group__textarea" aria-describedby="settings-import-desc"></textarea>
+	</div>
+	<br>
+	<p>
+		<input type="submit" class="yoast-button yoast-button--primary" value="<?php esc_attr_e( 'Import settings', 'wordpress-seo' ); ?>"/>
+	</p>
+</form>
diff --git a/admin/views/tool-bulk-editor.php b/admin/views/tool-bulk-editor.php
index 87c2d137560..b6e4e3ee60a 100644
--- a/admin/views/tool-bulk-editor.php
+++ b/admin/views/tool-bulk-editor.php
@@ -76,22 +76,6 @@ function yoast_free_bulk_sanitize_input_fields() {
 	exit;
 }
 
-/**
- * Renders a bulk editor tab.
- *
- * @param WPSEO_Bulk_List_Table $table The table to render.
- * @param string                $id    The id for the tab.
- */
-function wpseo_get_rendered_tab( $table, $id ) {
-	?>
-	<div id="<?php echo esc_attr( $id ); ?>" class="wpseotab">
-		<?php
-		$table->show_page();
-		?>
-	</div>
-	<?php
-}
-
 ?>
 <script>
 	// phpcs:ignore WordPress.Security.OutputEscaping -- WPSEO_Utils::format_json_encode is safe.
@@ -106,7 +90,7 @@ function wpseo_get_rendered_tab( $table, $id ) {
 <?php
 
 $tabs = [
-	'title' => [
+	'title'       => [
 		'label' => __( 'Title', 'wordpress-seo' ),
 	],
 	'description' => [
@@ -114,19 +98,34 @@ function wpseo_get_rendered_tab( $table, $id ) {
 	],
 ];
 
-?>
-
-	<nav class="yoast-tabs" id="wpseo-tabs">
-		<ul class="yoast-tabs__list">
-			<li class="yoast-tabs__list-item">
-				<a class="yoast-tabs__list-item-link" id="title-tab" href="#top#title"><?php esc_html_e( 'Title', 'wordpress-seo' ); ?></a>
-			</li>
-			<li class="yoast-tabs__list-item">
-				<a class="yoast-tabs__list-item-link" id="description-tab" href="#top#description"><?php esc_html_e( 'Description', 'wordpress-seo' ); ?></a>
-			</li>
-		</ul>
-	</nav>
-
-	<?php wpseo_get_rendered_tab( $wpseo_bulk_titles_table, 'title' ); ?>
-	<?php wpseo_get_rendered_tab( $wpseo_bulk_description_table, 'description' ); ?>
-</div>
+$title_collapsible = new WPSEO_Collapsible_Presenter(
+	__( 'Title', 'wordpress-seo' ),
+	WPSEO_PATH . 'admin/views/tabs/tool/bulk-editor-table.php',
+	[
+		'paper_id'  => 'bulk_editor_title',
+		'expanded'  => false,
+		'class'     => 'yoast-full-width',
+		'view_data' => [
+			'table'          => $wpseo_bulk_titles_table,
+			'collapsible_id' => 'bulk_editor_title',
+		],
+	]
+);
+echo $title_collapsible->get_output();
+
+$description_collapsible = new WPSEO_Collapsible_Presenter(
+	__( 'Description', 'wordpress-seo' ),
+	WPSEO_PATH . 'admin/views/tabs/tool/bulk-editor-table.php',
+	[
+		'paper_id'  => 'bulk_editor_description',
+		'expanded'  => false,
+		'class'     => 'yoast-full-width',
+		'view_data' => [
+			'table'          => $wpseo_bulk_description_table,
+			'collapsible_id' => 'bulk_editor_description',
+		],
+	]
+);
+echo $description_collapsible->get_output();
+
+echo '</div>';
diff --git a/admin/views/tool-file-editor.php b/admin/views/tool-file-editor.php
index 7fb4980a3df..9ff39fe6967 100644
--- a/admin/views/tool-file-editor.php
+++ b/admin/views/tool-file-editor.php
@@ -12,10 +12,12 @@
 }
 
 $yform          = Yoast_Form::get_instance();
+
 $robots_file    = get_home_path() . 'robots.txt';
-$ht_access_file = get_home_path() . '.htaccess';
+$robots_updated = false;
 
-echo '<div class="yoast-feature">';
+$ht_access_file   = get_home_path() . '.htaccess';
+$htaccess_updated = false;
 
 if ( isset( $_POST['create_robots'] ) ) {
 	if ( ! current_user_can( 'edit_files' ) ) {
@@ -56,11 +58,14 @@
 			$f = fopen( $robots_file, 'w+' );
 			fwrite( $f, $robotsnew );
 			fclose( $f );
+
 			$msg = sprintf(
 				/* translators: %s expands to robots.txt. */
 				__( 'Updated %s', 'wordpress-seo' ),
 				'robots.txt'
 			);
+
+			$robots_updated = true;
 		}
 	}
 }
@@ -84,6 +89,14 @@
 			$f = fopen( $ht_access_file, 'w+' );
 			fwrite( $f, $ht_access_new );
 			fclose( $f );
+
+			$msg = sprintf(
+			/* translators: %s expands to robots.txt. */
+				__( 'Updated %s', 'wordpress-seo' ),
+				'.htaccess'
+			);
+
+			$htaccess_updated = true;
 		}
 	}
 }
@@ -99,150 +112,37 @@
 if ( isset( $msg ) && ! empty( $msg ) ) {
 	echo '<div id="message" class="notice notice-success"><p>', esc_html( $msg ), '</p></div>';
 }
-// N.B.: "robots.txt" is a fixed file name and should not be translatable.
-echo '<div class="yoast-field-group">';
-echo '<h2>robots.txt</h2>';
-
-if ( ! file_exists( $robots_file ) ) {
-	if ( is_writable( get_home_path() ) ) {
-		echo '<form action="', esc_url( $action_url ), '" method="post" id="robotstxtcreateform">';
-		wp_nonce_field( 'wpseo_create_robots', '_wpnonce', true, true );
-		echo '<p>';
-		printf(
-			/* translators: %s expands to robots.txt. */
-			esc_html__( 'You don\'t have a %s file, create one here:', 'wordpress-seo' ),
-			'robots.txt'
-		);
-		echo '</p>';
 
-		printf(
-			'<input type="submit" class="yoast-button yoast-button--primary" name="create_robots" value="%s">',
-			sprintf(
-				/* translators: %s expands to robots.txt. */
-				esc_attr__( 'Create %s file', 'wordpress-seo' ),
-				'robots.txt'
-			)
-		);
-		echo '</form>';
-	}
-	else {
-		echo '<p>';
-		printf(
-			/* translators: %s expands to robots.txt. */
-			esc_html__( 'If you had a %s file and it was editable, you could edit it from here.', 'wordpress-seo' ),
-			'robots.txt'
-		);
-		echo '</p>';
-	}
-}
-else {
-	$f = fopen( $robots_file, 'r' );
-
-	$content = '';
-	if ( filesize( $robots_file ) > 0 ) {
-		$content = fread( $f, filesize( $robots_file ) );
-	}
+$robots_collapsible = new WPSEO_Collapsible_Presenter(
+	'robots.txt',
+	WPSEO_PATH . 'admin/views/tabs/tool/file-editor-robots.php',
+	[
+		'expanded'  => $robots_updated,
+		'view_data' => [
+			'robots_file' => $robots_file,
+			'action_url'  => $action_url,
+		],
+	]
+);
+echo $robots_collapsible->get_output();
 
-	if ( ! is_writable( $robots_file ) ) {
-		echo '<p><em>';
-		printf(
-			/* translators: %s expands to robots.txt. */
-			esc_html__( 'If your %s were writable, you could edit it from here.', 'wordpress-seo' ),
-			'robots.txt'
-		);
-		echo '</em></p>';
-		echo '<textarea class="yoast-field-group__textarea code" disabled="disabled" rows="15" name="robotsnew">', esc_textarea( $content ), '</textarea><br/>';
-	}
-	else {
-		echo '<form action="', esc_url( $action_url ), '" method="post" id="robotstxtform">';
-		wp_nonce_field( 'wpseo-robotstxt', '_wpnonce', true, true );
-		echo '<div class="yoast-field-group__title">';
-		echo '<label for="robotsnew" class="yoast-inline-label">';
-		printf(
-			/* translators: %s expands to robots.txt. */
-			esc_html__( 'Edit the content of your %s:', 'wordpress-seo' ),
-			'robots.txt'
-		);
-		echo '</label>';
-		echo '</div>';
-		echo '<textarea class="yoast-field-group__textarea code" rows="15" name="robotsnew" id="robotsnew">', esc_textarea( $content ), '</textarea><br/>';
-		printf(
-			'<p class="submit"><input class="yoast-button yoast-button--primary" type="submit" name="submitrobots" value="%s" /></p>',
-			sprintf(
-				/* translators: %s expands to robots.txt. */
-				esc_attr__( 'Save changes to %s', 'wordpress-seo' ),
-				'robots.txt'
-			)
-		);
-		echo '</form>';
-	}
-}
-echo '</div>';
 if ( ! WPSEO_Utils::is_nginx() ) {
 
-	echo '<h2>';
-	printf(
+	$htaccess_collapsible = new WPSEO_Collapsible_Presenter(
 		/* translators: %s expands to ".htaccess". */
-		esc_html__( '%s file', 'wordpress-seo' ),
-		'.htaccess'
+		sprintf( esc_html__( '%s file', 'wordpress-seo' ), '.htaccess' ),
+		WPSEO_PATH . 'admin/views/tabs/tool/file-editor-htaccess.php',
+		[
+			'expanded'  => $htaccess_updated,
+			'view_data' => [
+				'ht_access_file' => $ht_access_file,
+				'action_url'     => $action_url,
+			],
+		]
 	);
-	echo '</h2>';
-
-	if ( file_exists( $ht_access_file ) ) {
-		$f = fopen( $ht_access_file, 'r' );
-
-		$contentht = '';
-		if ( filesize( $ht_access_file ) > 0 ) {
-			$contentht = fread( $f, filesize( $ht_access_file ) );
-		}
-
-		if ( ! is_writable( $ht_access_file ) ) {
-			echo '<p><em>';
-			printf(
-				/* translators: %s expands to ".htaccess". */
-				esc_html__( 'If your %s were writable, you could edit it from here.', 'wordpress-seo' ),
-				'.htaccess'
-			);
-			echo '</em></p>';
-			echo '<textarea class="yoast-field-group__textarea code" disabled="disabled" rows="15" name="robotsnew">', esc_textarea( $contentht ), '</textarea><br/>';
-		}
-		else {
-			echo '<form action="', esc_url( $action_url ), '" method="post" id="htaccessform">';
-			wp_nonce_field( 'wpseo-htaccess', '_wpnonce', true, true );
-			echo '<div class="yoast-field-group__title">';
-			echo '<label for="htaccessnew" class="yoast-inline-label">';
-			printf(
-				/* translators: %s expands to ".htaccess". */
-				esc_html__( 'Edit the content of your %s:', 'wordpress-seo' ),
-				'.htaccess'
-			);
-			echo '</label>';
-			echo '</div>';
-			echo '<textarea class="yoast-field-group__textarea code" rows="15" name="htaccessnew" id="htaccessnew">', esc_textarea( $contentht ), '</textarea><br/>';
-			printf(
-				'<p class="submit"><input class="yoast-button yoast-button--primary" type="submit" name="submithtaccess" value="%s" /></p>',
-				sprintf(
-					/* translators: %s expands to ".htaccess". */
-					esc_attr__( 'Save changes to %s', 'wordpress-seo' ),
-					'.htaccess'
-				)
-			);
-			echo '</form>';
-		}
-	}
-	else {
-		echo '<p>';
-		printf(
-			/* translators: %s expands to ".htaccess". */
-			esc_html__( 'If you had a %s file and it was editable, you could edit it from here.', 'wordpress-seo' ),
-			'.htaccess'
-		);
-		echo '</p>';
-	}
+	echo $htaccess_collapsible->get_output();
 }
 
-echo '</div>';
-
 if ( is_multisite() ) {
 	$yform->admin_footer( false );
 }
diff --git a/admin/views/tool-import-export.php b/admin/views/tool-import-export.php
index 02ba501787d..890b63dabfd 100644
--- a/admin/views/tool-import-export.php
+++ b/admin/views/tool-import-export.php
@@ -92,30 +92,12 @@
 	],
 ];
 
-?>
-
-	<nav class="yoast-tabs" id="wpseo-tabs">
-		<ul class="yoast-tabs__list">
-		<?php foreach ( $tabs as $identifier => $tab ) : ?>
-			<li class="yoast-tabs__list-item">
-			<a class="yoast-tabs__list-item-link" id="<?php echo esc_attr( $identifier . '-tab' ); ?>" href="<?php echo esc_url( '#top#' . $identifier ); ?>"><?php echo esc_html( $tab['label'] ); ?></a>
-			</li>
-		<?php endforeach; ?>
-		<?php
-			/**
-			 * Allow adding a custom import tab header.
-			 */
-			do_action( 'wpseo_import_tab_header' );
-		?>
-		</ul>
-	</nav>
-
-<?php
-
 foreach ( $tabs as $identifier => $tab ) {
-	printf( '<div id="%s" class="wpseotab">', esc_attr( $identifier ) );
-	require_once WPSEO_PATH . 'admin/views/tabs/tool/' . $identifier . '.php';
-	echo '</div>';
+	$collapsible = new WPSEO_Collapsible_Presenter(
+		$tab['label'],
+		WPSEO_PATH . 'admin/views/tabs/tool/' . $identifier . '.php'
+	);
+	echo $collapsible->get_output();
 }
 
 /**
diff --git a/admin/views/tools-navigation.php b/admin/views/tools-navigation.php
new file mode 100644
index 00000000000..b728d4d5340
--- /dev/null
+++ b/admin/views/tools-navigation.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * WPSEO plugin file.
+ *
+ * @package WPSEO\Admin\Views
+ */
+
+$admin_url = admin_url( 'admin.php?page=wpseo_tools' );
+
+?>
+<nav class="yoast-tabs" id="wpseo-tabs">
+	<ul class="yoast-tabs__list">
+		<?php
+
+		foreach ( $tools as $slug => $tool ) {
+			$href = ( isset( $tool['href'] ) ) ? $admin_url . $tool['href'] : add_query_arg( [ 'tool' => $slug ],
+				$admin_url );
+
+			$active_item = '';
+
+			if ( $slug === $tool_page ) {
+				$active_item = ' yoast-tabs__list-item--active';
+			}
+
+			if ( empty( $tool_page ) && $slug === 'general' ) {
+				$active_item = ' yoast-tabs__list-item--active';
+			}
+			?>
+			<li class="yoast-tabs__list-item<?php echo esc_attr( $active_item ) ?>">
+				<a class="yoast-tabs__list-item-link" id="<?php echo esc_attr( $slug ) ?>" -tab"
+				href="<?php echo esc_url( $href ) ?>"><?php echo esc_html( $tool['title'] ); ?></a>
+			</li>
+		<?php
+		}
+		?>
+	</ul>
+</nav>
diff --git a/css/src/admin/admin.css b/css/src/admin/admin.css
index aa5aede3696..809418ffef0 100644
--- a/css/src/admin/admin.css
+++ b/css/src/admin/admin.css
@@ -1,42 +1,40 @@
-.collapsible-header .toggleable-container-icon {
-	float: right;
-	color: var(--yoast-color-default);
-	cursor: pointer;
+.yoast .update-nag {
+	margin-left: 32px;
 }
 
-.collapsible-header code {
-	font-size: 14px;
-	font-weight: 700;
-	border: var(--yoast-border-default);
-	color: var(--yoast-color-default);
-	padding: 5px;
-	margin: 0 2px;
-	background: var(--yoast-color-secondary);
+.yoast-space-after {
+	margin-bottom: 32px;
 }
 
-.toggleable-container-hidden {
-	display: none;
+.wpseotab > * {
+	margin-left: auto;
+	margin-right: auto;
 }
 
-.yoast-field-group__title code {
-	font-size: 13px;
-	font-weight: 700;
-	border: var(--yoast-border-default);
-	color: var(--yoast-color-default);
-	padding: 3px 5px;
-	margin: 0 2px;
+.yoast-feature {
+	max-width: var(--yoast-container-width);
 }
 
-.collapsible-header .toggleable-container-trigger {
-	display: block;
-    width: 100%;
-    text-align: left;
-    border: 0;
-    background: none;
-	color: var(--yoast-primary-color);
+#wpseo-submit-container p.wpseo-message {
+	margin: 0 auto;
+	padding: 16px 0;
+	max-width: var(--yoast-container-width);
+	color: #008a00;
+}
+
+.yoast-paper.yoast-space-bottom {
 	padding-bottom: 16px;
 }
 
+.yoast-field-group__title code {
+	font-size: 13px;
+	font-weight: normal;
+	color: var(--yoast-color-default);
+	padding: 0;
+	margin: 0 4px;
+	background: none;
+}
+
 #wpseo_progressbar {
 	height: 25px;
 	border: 1px solid var(--yoast-color-primary);
diff --git a/css/src/admin/all.css b/css/src/admin/all.css
index 94598111e4f..731996059e4 100644
--- a/css/src/admin/all.css
+++ b/css/src/admin/all.css
@@ -1,6 +1,7 @@
 @import "./admin.css";
+@import "./overwrites.css";
 
-@import "../base/colors.css";
+@import "../base/variables.css";
 @import "../base/icons.css";
 
 @import "../components/tabs.css";
@@ -12,3 +13,4 @@
 @import "../components/lists.css";
 @import "../components/table.css";
 @import "../components/collapsible.css";
+@import "../components/toggle.css";
diff --git a/css/src/admin/overwrites.css b/css/src/admin/overwrites.css
new file mode 100644
index 00000000000..a05a6500a29
--- /dev/null
+++ b/css/src/admin/overwrites.css
@@ -0,0 +1,9 @@
+.yoast #rss textarea {
+	min-height: 80px;
+}
+
+.yoast #wpcontent p.submit {
+	padding-top: 8px;
+	margin: 0 auto 16px;
+	max-width: var(--yoast-container-width);
+}
diff --git a/css/src/base/colors.css b/css/src/base/colors.css
deleted file mode 100644
index 826fb05f289..00000000000
--- a/css/src/base/colors.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/** CSS selectors instead of SASS. */
-:root {
-	--yoast-color-default: #404040;
-	--yoast-color-default-darker: #303030;
-	--yoast-color-primary: #a4286a;
-	--yoast-color-secondary: #f7f7f7;
-	--yoast-color-white: #ffffff;
-	--yoast-color-primary-darker: #7b1e50;
-	--yoast-color-secondary-darker: #d9d9d9;
-	--yoast-color-dark: #303030;
-	--yoast-color-sale: #fec228;
-	--yoast-color-sale-darker: #feb601;
-	--yoast-color-border: rgba(0,0,0, 0.2);
-	--yoast-color-active: #6EA029;
-	--yoast-color-inactive: #DC3232;
-	--yoast-color-link: #006DAC;
-	--yoast-color-inactive-text: #707070;
-	--yoast-color-inactive-grey: #9E9E9E;
-	--yoast-color-inactive-grey-light: #f1f1f1;
-	--yoast-color-active-light: #B6CF94;
-  
-	--yoast-font-size-default: 14px;
-  
-	--yoast-border-default: 1px solid var(--yoast-color-border);
-  
-	--yoast-shadow-default: 0px 3px 6px rgba(0, 0, 0, 0.15);
-
-	--yoast-transition-default: all 150ms ease-out;
-}
diff --git a/css/src/base/icons.css b/css/src/base/icons.css
index f9ec5242632..af1f175f8d9 100644
--- a/css/src/base/icons.css
+++ b/css/src/base/icons.css
@@ -1,25 +1,3 @@
-:root {
-	--yoast-svg-icon-info: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23A4286A" d="M1152 1376v-160q0-14-9-23t-23-9h-96v-512q0-14-9-23t-23-9h-320q-14 0-23 9t-9 23v160q0 14 9 23t23 9h96v320h-96q-14 0-23 9t-9 23v160q0 14 9 23t23 9h448q14 0 23-9t9-23zm-128-896v-160q0-14-9-23t-23-9h-192q-14 0-23 9t-9 23v160q0 14 9 23t23 9h192q14 0 23-9t9-23zm640 416q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/></svg>');
-	--yoast-svg-icon-check: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%2377B227" d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z"/></svg>');
-	--yoast-svg-icon-check-ok: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%2377B227" d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z"/></svg>');
-	--yoast-svg-icon-caret-right: url('data:image/svg+xml,<svg width="16" height="16" viewBox="0 0 192 512" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M 0 384.662 V 127.338 c 0 -17.818 21.543 -26.741 34.142 -14.142 l 128.662 128.662 c 7.81 7.81 7.81 20.474 0 28.284 L 34.142 398.804 C 21.543 411.404 0 402.48 0 384.662 Z"/></svg>');
-	--yoast-svg-icon-caret-left: url('data:image/svg+xml,<svg width="16" height="16" viewBox="0 0 192 512" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M192 127.338v257.324c0 17.818-21.543 26.741-34.142 14.142L29.196 270.142c-7.81-7.81-7.81-20.474 0-28.284l128.662-128.662c12.599-12.6 34.142-3.676 34.142 14.142z"/></svg>');
-	--yoast-svg-icon-eye: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M1664 960q-152-236-381-353 61 104 61 225 0 185-131.5 316.5t-316.5 131.5-316.5-131.5-131.5-316.5q0-121 61-225-229 117-381 353 133 205 333.5 326.5t434.5 121.5 434.5-121.5 333.5-326.5zm-720-384q0-20-14-34t-34-14q-125 0-214.5 89.5t-89.5 214.5q0 20 14 34t34 14 34-14 14-34q0-86 61-147t147-61q20 0 34-14t14-34zm848 384q0 34-20 69-140 230-376.5 368.5t-499.5 138.5-499.5-139-376.5-368q-20-35-20-69t20-69q140-229 376.5-368t499.5-139 499.5 139 376.5 368q20 35 20 69z" /></svg>');
-	--yoast-svg-icon-list: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M384 1408q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm0-512q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm1408 416v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5zm-1408-928q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm1408 416v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5zm0-512v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5z"/></svg>');
-	--yoast-svg-icon-key: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M832 512q0-80-56-136t-136-56-136 56-56 136q0 42 19 83-41-19-83-19-80 0-136 56t-56 136 56 136 136 56 136-56 56-136q0-42-19-83 41 19 83 19 80 0 136-56t56-136zm851 704q0 17-49 66t-66 49q-9 0-28.5-16t-36.5-33-38.5-40-24.5-26l-96 96 220 220q28 28 28 68 0 42-39 81t-81 39q-40 0-68-28l-671-671q-176 131-365 131-163 0-265.5-102.5t-102.5-265.5q0-160 95-313t248-248 313-95q163 0 265.5 102.5t102.5 265.5q0 189-131 365l355 355 96-96q-3-3-26-24.5t-40-38.5-33-36.5-16-28.5q0-17 49-66t66-49q13 0 23 10 6 6 46 44.5t82 79.5 86.5 86 73 78 28.5 41z"/></svg>');
-	--yoast-svg-icon-edit: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M491 1536l91-91-235-235-91 91v107h128v128h107zm523-928q0-22-22-22-10 0-17 7l-542 542q-7 7-7 17 0 22 22 22 10 0 17-7l542-542q7-7 7-17zm-54-192l416 416-832 832h-416v-416zm683 96q0 53-37 90l-166 166-416-416 166-165q36-38 90-38 53 0 91 38l235 234q37 39 37 91z" /></svg>');
-	--yoast-svg-icon-yoast: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23999999" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
-	--yoast-svg-icon-yoast-good: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%237ad03a" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
-	--yoast-svg-icon-yoast-ok: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23ee7c1b" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
-	--yoast-svg-icon-yoast-bad: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23dc3232" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
-	--yoast-svg-icon-yoast-noindex: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%231e8cbe" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
-  --yoast-svg-icon-sort-up: url("data:image/svg+xml;charset=utf8,%3C?xml version='1.0' encoding='UTF-8'?%3E%3Csvg width='6px' height='4px' viewBox='0 0 6 4' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3Efa-solid:sort-down%3C/title%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Redirects' transform='translate(-280.000000, -763.000000)' fill='%23000000' fill-rule='nonzero'%3E%3Cg id='Table-1' transform='translate(192.000000, 738.000000)'%3E%3Cg id='Table-bars'%3E%3Cg id='Group-3' transform='translate(50.000000, 17.000000)'%3E%3Cpath d='M38.5046427,8 L43.4953573,8 C43.9441023,8 44.1684747,8.6201736 43.851837,8.98174199 L41.3564796,11.8311883 C41.1593674,12.0562706 40.8406326,12.0562706 40.6456173,11.8311883 L38.148163,8.98174199 C37.8315253,8.6201736 38.0558977,8 38.5046427,8 Z' id='fa-solid:sort-down' transform='translate(41.000000, 10.000000) scale(1, -1) translate(-41.000000, -10.000000) '%3E%3C/path%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
-	--yoast-svg-icon-sort-down: url("data:image/svg+xml;charset=utf8,%3C?xml version='1.0' encoding='UTF-8'?%3E%3Csvg width='6px' height='4px' viewBox='0 0 6 4' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3Efa-solid:sort-down%3C/title%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Redirects' transform='translate(-280.000000, -763.000000)' fill='%23000000' fill-rule='nonzero'%3E%3Cg id='Table-1' transform='translate(192.000000, 738.000000)'%3E%3Cg id='Table-bars'%3E%3Cg id='Group-3' transform='translate(50.000000, 17.000000)'%3E%3Cpath d='M38.5046427,8 L43.4953573,8 C43.9441023,8 44.1684747,8.6201736 43.851837,8.98174199 L41.3564796,11.8311883 C41.1593674,12.0562706 40.8406326,12.0562706 40.6456173,11.8311883 L38.148163,8.98174199 C37.8315253,8.6201736 38.0558977,8 38.5046427,8 Z' id='fa-solid:sort-down'%3E%3C/path%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
-	--yoast-svg-icon-sort: url("data:image/svg+xml;charset=utf8,%3C?xml version='1.0' encoding='UTF-8'?%3E%3Csvg width='6px' height='9px' viewBox='0 0 6 9' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3Efa-solid:sort copy%3C/title%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Redirects' transform='translate(-729.000000, -760.000000)' fill='%23707070' fill-rule='nonzero'%3E%3Cg id='Table-1' transform='translate(192.000000, 738.000000)'%3E%3Cg id='Table-bars'%3E%3Cg id='Group-2' transform='translate(477.000000, 17.000000)'%3E%3Cpath d='M60.5046427,10.2234363 L65.4953573,10.2234363 C65.9441023,10.2234363 66.1684747,10.8089676 65.851837,11.1503391 L63.3564796,13.8406179 C63.1593674,14.0531274 62.8406326,14.0531274 62.6456173,13.8406179 L60.148163,11.1503391 C59.8315253,10.8089676 60.0558977,10.2234363 60.5046427,10.2234363 Z M65.851837,7.84966089 L63.3564796,5.15938206 C63.1593674,4.94687265 62.8406326,4.94687265 62.6456173,5.15938206 L60.148163,7.84966089 C59.8315253,8.1910324 60.0558977,8.77656368 60.5046427,8.77656368 L65.4953573,8.77656368 C65.9441023,8.77656368 66.1684747,8.1910324 65.851837,7.84966089 Z' id='fa-solid:sort-copy'%3E%3C/path%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
-	--yoast-checkmark--green: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="%236EA029" viewBox="0 0 512 512"><path d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"/></svg>');
-	--yoast-exclamation-mark: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="%2300468f" viewBox="0 0 512 512"><path d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zm-248 50c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"></path></svg>');
-}
-
 .yoast-help {
 	margin-left: 4px;
 	text-decoration: none;
@@ -35,5 +13,3 @@
 .yoast-help:hover svg {
 	fill: var(--yoast-color-link);
 }
-
-/*# sourceMappingURL=icons.css.map */
diff --git a/css/src/base/variables.css b/css/src/base/variables.css
new file mode 100644
index 00000000000..8179990b3d8
--- /dev/null
+++ b/css/src/base/variables.css
@@ -0,0 +1,64 @@
+/** CSS selectors instead of SASS. */
+:root {
+	/* Colors */
+	--yoast-color-default: #404040;
+	--yoast-color-default-darker: #303030;
+	--yoast-color-primary: #a4286a;
+	--yoast-color-secondary: #f7f7f7;
+	--yoast-color-white: #ffffff;
+	--yoast-color-primary-darker: #7b1e50;
+	--yoast-color-secondary-darker: #d9d9d9;
+	--yoast-color-dark: #303030;
+	--yoast-color-sale: #fec228;
+	--yoast-color-sale-darker: #feb601;
+	--yoast-color-border: rgba(0,0,0, 0.2);
+	--yoast-color-active: #6EA029;
+	--yoast-color-inactive: #DC3232;
+	--yoast-color-link: #006DAC;
+	--yoast-color-inactive-text: #707070;
+	--yoast-color-inactive-grey: #9E9E9E;
+	--yoast-color-inactive-grey-light: #f1f1f1;
+	--yoast-color-active-light: #B6CF94;
+
+	/* Fonts */
+	--yoast-font-size-default: 14px;
+
+	/* Borders */
+	--yoast-border-default: 1px solid var(--yoast-color-border);
+
+	/* Shadows */
+	--yoast-shadow-default: 0 2px 6px rgba(0, 0, 0, 0.15);
+
+	/* Transitions */
+	--yoast-transition-default: all 150ms ease-out;
+
+	/* Images */
+	--yoast-svg-icon-info: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23A4286A" d="M1152 1376v-160q0-14-9-23t-23-9h-96v-512q0-14-9-23t-23-9h-320q-14 0-23 9t-9 23v160q0 14 9 23t23 9h96v320h-96q-14 0-23 9t-9 23v160q0 14 9 23t23 9h448q14 0 23-9t9-23zm-128-896v-160q0-14-9-23t-23-9h-192q-14 0-23 9t-9 23v160q0 14 9 23t23 9h192q14 0 23-9t9-23zm640 416q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/></svg>');
+	--yoast-svg-icon-check: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%2377B227" d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z"/></svg>');
+	--yoast-svg-icon-check-ok: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%2377B227" d="M1671 566q0 40-28 68l-724 724-136 136q-28 28-68 28t-68-28l-136-136-362-362q-28-28-28-68t28-68l136-136q28-28 68-28t68 28l294 295 656-657q28-28 68-28t68 28l136 136q28 28 28 68z"/></svg>');
+	--yoast-svg-icon-caret-right: url('data:image/svg+xml,<svg width="16" height="16" viewBox="0 0 192 512" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M 0 384.662 V 127.338 c 0 -17.818 21.543 -26.741 34.142 -14.142 l 128.662 128.662 c 7.81 7.81 7.81 20.474 0 28.284 L 34.142 398.804 C 21.543 411.404 0 402.48 0 384.662 Z"/></svg>');
+	--yoast-svg-icon-caret-left: url('data:image/svg+xml,<svg width="16" height="16" viewBox="0 0 192 512" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M192 127.338v257.324c0 17.818-21.543 26.741-34.142 14.142L29.196 270.142c-7.81-7.81-7.81-20.474 0-28.284l128.662-128.662c12.599-12.6 34.142-3.676 34.142 14.142z"/></svg>');
+	--yoast-svg-icon-eye: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M1664 960q-152-236-381-353 61 104 61 225 0 185-131.5 316.5t-316.5 131.5-316.5-131.5-131.5-316.5q0-121 61-225-229 117-381 353 133 205 333.5 326.5t434.5 121.5 434.5-121.5 333.5-326.5zm-720-384q0-20-14-34t-34-14q-125 0-214.5 89.5t-89.5 214.5q0 20 14 34t34 14 34-14 14-34q0-86 61-147t147-61q20 0 34-14t14-34zm848 384q0 34-20 69-140 230-376.5 368.5t-499.5 138.5-499.5-139-376.5-368q-20-35-20-69t20-69q140-229 376.5-368t499.5-139 499.5 139 376.5 368q20 35 20 69z" /></svg>');
+	--yoast-svg-icon-list: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M384 1408q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm0-512q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm1408 416v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5zm-1408-928q0 80-56 136t-136 56-136-56-56-136 56-136 136-56 136 56 56 136zm1408 416v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5zm0-512v192q0 13-9.5 22.5t-22.5 9.5h-1216q-13 0-22.5-9.5t-9.5-22.5v-192q0-13 9.5-22.5t22.5-9.5h1216q13 0 22.5 9.5t9.5 22.5z"/></svg>');
+	--yoast-svg-icon-key: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M832 512q0-80-56-136t-136-56-136 56-56 136q0 42 19 83-41-19-83-19-80 0-136 56t-56 136 56 136 136 56 136-56 56-136q0-42-19-83 41 19 83 19 80 0 136-56t56-136zm851 704q0 17-49 66t-66 49q-9 0-28.5-16t-36.5-33-38.5-40-24.5-26l-96 96 220 220q28 28 28 68 0 42-39 81t-81 39q-40 0-68-28l-671-671q-176 131-365 131-163 0-265.5-102.5t-102.5-265.5q0-160 95-313t248-248 313-95q163 0 265.5 102.5t102.5 265.5q0 189-131 365l355 355 96-96q-3-3-26-24.5t-40-38.5-33-36.5-16-28.5q0-17 49-66t66-49q13 0 23 10 6 6 46 44.5t82 79.5 86.5 86 73 78 28.5 41z"/></svg>');
+	--yoast-svg-icon-edit: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23555555" d="M491 1536l91-91-235-235-91 91v107h128v128h107zm523-928q0-22-22-22-10 0-17 7l-542 542q-7 7-7 17 0 22 22 22 10 0 17-7l542-542q7-7 7-17zm-54-192l416 416-832 832h-416v-416zm683 96q0 53-37 90l-166 166-416-416 166-165q36-38 90-38 53 0 91 38l235 234q37 39 37 91z" /></svg>');
+	--yoast-svg-icon-yoast: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23999999" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
+	--yoast-svg-icon-yoast-good: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%237ad03a" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
+	--yoast-svg-icon-yoast-ok: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23ee7c1b" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
+	--yoast-svg-icon-yoast-bad: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%23dc3232" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
+	--yoast-svg-icon-yoast-noindex: url('data:image/svg+xml,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg" role="img" aria-hidden="true" focusable="false"><path fill="%231e8cbe" d="M403 218h691l-26 72h-665q-110 0-188.5 79t-78.5 189v771q0 95 60.5 169.5t153.5 93.5q23 5 98 5v72h-45q-140 0-239.5-100t-99.5-240v-771q0-140 99.5-240t239.5-100zm851-218h247l-482 1294q-23 61-40.5 103.5t-45 98-54 93.5-64.5 78.5-79.5 65-95.5 41-116 18.5v-195q163-26 220-182 20-52 20-105 0-54-20-106l-285-733h228l187 585zm474 558v1111h-795q37-55 45-73h678v-1038q0-85-49.5-155t-129.5-99l25-67q101 34 163.5 123.5t62.5 197.5z"/></svg>');
+	--yoast-svg-icon-sort-up: url("data:image/svg+xml;charset=utf8,%3C?xml version='1.0' encoding='UTF-8'?%3E%3Csvg width='6px' height='4px' viewBox='0 0 6 4' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3Efa-solid:sort-down%3C/title%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Redirects' transform='translate(-280.000000, -763.000000)' fill='%23000000' fill-rule='nonzero'%3E%3Cg id='Table-1' transform='translate(192.000000, 738.000000)'%3E%3Cg id='Table-bars'%3E%3Cg id='Group-3' transform='translate(50.000000, 17.000000)'%3E%3Cpath d='M38.5046427,8 L43.4953573,8 C43.9441023,8 44.1684747,8.6201736 43.851837,8.98174199 L41.3564796,11.8311883 C41.1593674,12.0562706 40.8406326,12.0562706 40.6456173,11.8311883 L38.148163,8.98174199 C37.8315253,8.6201736 38.0558977,8 38.5046427,8 Z' id='fa-solid:sort-down' transform='translate(41.000000, 10.000000) scale(1, -1) translate(-41.000000, -10.000000) '%3E%3C/path%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+	--yoast-svg-icon-sort-down: url("data:image/svg+xml;charset=utf8,%3C?xml version='1.0' encoding='UTF-8'?%3E%3Csvg width='6px' height='4px' viewBox='0 0 6 4' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3Efa-solid:sort-down%3C/title%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Redirects' transform='translate(-280.000000, -763.000000)' fill='%23000000' fill-rule='nonzero'%3E%3Cg id='Table-1' transform='translate(192.000000, 738.000000)'%3E%3Cg id='Table-bars'%3E%3Cg id='Group-3' transform='translate(50.000000, 17.000000)'%3E%3Cpath d='M38.5046427,8 L43.4953573,8 C43.9441023,8 44.1684747,8.6201736 43.851837,8.98174199 L41.3564796,11.8311883 C41.1593674,12.0562706 40.8406326,12.0562706 40.6456173,11.8311883 L38.148163,8.98174199 C37.8315253,8.6201736 38.0558977,8 38.5046427,8 Z' id='fa-solid:sort-down'%3E%3C/path%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+	--yoast-svg-icon-sort: url("data:image/svg+xml;charset=utf8,%3C?xml version='1.0' encoding='UTF-8'?%3E%3Csvg width='6px' height='9px' viewBox='0 0 6 9' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Ctitle%3Efa-solid:sort copy%3C/title%3E%3Cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3E%3Cg id='Redirects' transform='translate(-729.000000, -760.000000)' fill='%23707070' fill-rule='nonzero'%3E%3Cg id='Table-1' transform='translate(192.000000, 738.000000)'%3E%3Cg id='Table-bars'%3E%3Cg id='Group-2' transform='translate(477.000000, 17.000000)'%3E%3Cpath d='M60.5046427,10.2234363 L65.4953573,10.2234363 C65.9441023,10.2234363 66.1684747,10.8089676 65.851837,11.1503391 L63.3564796,13.8406179 C63.1593674,14.0531274 62.8406326,14.0531274 62.6456173,13.8406179 L60.148163,11.1503391 C59.8315253,10.8089676 60.0558977,10.2234363 60.5046427,10.2234363 Z M65.851837,7.84966089 L63.3564796,5.15938206 C63.1593674,4.94687265 62.8406326,4.94687265 62.6456173,5.15938206 L60.148163,7.84966089 C59.8315253,8.1910324 60.0558977,8.77656368 60.5046427,8.77656368 L65.4953573,8.77656368 C65.9441023,8.77656368 66.1684747,8.1910324 65.851837,7.84966089 Z' id='fa-solid:sort-copy'%3E%3C/path%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+	--yoast-checkmark--green: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="%236EA029" viewBox="0 0 512 512"><path d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"/></svg>');
+	--yoast-exclamation-mark: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="%2300468f" viewBox="0 0 512 512"><path d="M504 256c0 136.997-111.043 248-248 248S8 392.997 8 256C8 119.083 119.043 8 256 8s248 111.083 248 248zm-248 50c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"></path></svg>');
+
+	/* Layout */
+	--yoast-container-width: 600px;
+}
+
+@media screen and (min-width: 1400px) {
+	:root {
+		--yoast-container-width: 750px;
+	}
+}
diff --git a/css/src/components/buttons.css b/css/src/components/buttons.css
index d01af240097..b12b84bd932 100644
--- a/css/src/components/buttons.css
+++ b/css/src/components/buttons.css
@@ -1,7 +1,7 @@
 .yoast .yoast-button {
 	display: inline-block;
 	position: relative;
-	padding: 11px 13px 13px;
+	padding: 10px;
 	text-decoration: none;
 	border-radius: 4px;
 	border: 1px solid rgba(0,0,0, 0.2);
@@ -13,7 +13,7 @@
 
 .yoast .yoast-button:active { /* 'Pressed' button state */
 	box-shadow: none;
-	padding-bottom: 12px;
+	padding-bottom: 10px;
 	top: 2px;
 }
 
@@ -55,6 +55,9 @@
 .yoast .yoast-button--buy {
 	display: inline-flex;
 	align-items: center;
+	padding: 12px;
+	font-size: 16px;
+	font-weight: 500;
 	color: var(--yoast-color-dark);
 	background-color: var(--yoast-color-sale);
 }
diff --git a/css/src/components/collapsible.css b/css/src/components/collapsible.css
index 8982d61c226..1b75b49b347 100644
--- a/css/src/components/collapsible.css
+++ b/css/src/components/collapsible.css
@@ -1,10 +1,62 @@
 .yoast-collapsible {
-	margin-bottom: 48px;
-	max-width: 600px;
+	margin-bottom: 16px;
+	margin-left: auto;
+	margin-right: auto;
+	max-width: var(--yoast-container-width);
 	position: relative;
+	box-shadow: var(--yoast-shadow-default);
+	border: var(--yoast-border-default);
 }
 
-.yoast-collapsible .collapsible-header {
-	border-bottom: var(--yoast-border-default);
-	padding-bottom: 13px;
+.yoast-collapsible.yoast-full-width {
+	max-width: 100%;
+}
+
+.yoast #wpcontent .yoast-collapsible h3 {
+	font-size: 1.4em;
+	font-weight: 300;
+	padding-top: 16px;
+	margin-bottom: 16px;
+}
+
+.toggleable-container {
+	padding: 0 16px;
+}
+
+.toggleable-container-hidden {
+	display: none;
+}
+
+.yoast #wpcontent h2.collapsible-header {
+	margin-bottom: 0;
+}
+
+.collapsible-header .toggleable-container-icon {
+	float: right;
+	color: var(--yoast-color-default);
+	cursor: pointer;
+}
+
+.collapsible-header code {
+	font-size: 16px;
+	font-weight: normal;
+	color: var(--yoast-color-default);
+	padding: 0;
+	margin: 0 4px;
+	background: none;
+}
+
+.collapsible-header .toggleable-container-trigger {
+	display: block;
+	width: 100%;
+	text-align: left;
+	border: 0;
+	background: none;
+	color: var(--yoast-primary-color);
+	padding: 16px;
+	cursor: pointer;
+}
+
+.collapsible-header .toggleable-container-trigger:focus {
+	outline: 0;
 }
diff --git a/css/src/components/headings.css b/css/src/components/headings.css
index ff2e438897a..679e682be8e 100644
--- a/css/src/components/headings.css
+++ b/css/src/components/headings.css
@@ -9,13 +9,12 @@ body.yoast {
 }
 
 .wrap {
-	margin: 32px 32px 0;
+	margin: 16px 16px 0;
 	font-size: var(--yoast-font-size-default);
 	color: var(--yoast-color-default);
 	line-height: 1.5;
 }
 
-
 /** On admin pages, the <body> Has the class "yoast", this way we can target only our own pages. */
 .yoast #wpcontent h1,
 .yoast #wpcontent h2,
@@ -23,7 +22,7 @@ body.yoast {
 .yoast #wpcontent .h1,
 .yoast #wpcontent .h2,
 .yoast #wpcontent .h3 {
-	font-weight: 400;
+	font-weight: 300;
 	color: var(--yoast-color-primary);
 	padding: 0;
 	margin-top: 0;
@@ -31,6 +30,11 @@ body.yoast {
 	line-height: 1.2;
 }
 
+.yoast #wpcontent h3,
+.yoast #wpcontent .h3 {
+	font-weight: 400;
+}
+
 .yoast #wpcontent h1, .yoast #wpcontent .h1 {
 	font-size: 1.7em;
 	margin-bottom: 1.34em;
@@ -50,6 +54,11 @@ body.yoast {
 	font-size: 1em;
 }
 
-.yoast .update-nag{
-	margin-left: 32px;
+.yoast #wpcontent #wpseo-title {
+	text-align: center;
+	margin-bottom: 16px;
+}
+
+.yoast #wpcontent .yoast-premium #wpseo-title {
+	text-align: left;
 }
diff --git a/css/src/components/lists.css b/css/src/components/lists.css
index 3d90783a90d..0a2aa16787a 100644
--- a/css/src/components/lists.css
+++ b/css/src/components/lists.css
@@ -1,6 +1,5 @@
 .yoast-list {
 	margin-left: 22px;
-	max-width: 600px;
 }
 
 .yoast-list li {
@@ -51,4 +50,4 @@
 	position: absolute;
 	left: -20px;
 	top: 5px;
-}
\ No newline at end of file
+}
diff --git a/css/src/components/paper.css b/css/src/components/paper.css
index 33e7a705ab8..ea35e87356e 100644
--- a/css/src/components/paper.css
+++ b/css/src/components/paper.css
@@ -1,12 +1,28 @@
 .yoast-paper {
 	background-color: white;
-	padding: 24px;
-	margin-bottom: 32px;
+	padding: 16px 16px 0;
 	box-shadow: var(--yoast-shadow-default);
 	border: var(--yoast-border-default);
-	max-width: 600px;
+	max-width: var(--yoast-container-width);
 	position: relative;
 	box-sizing: border-box;
+	margin: 0 auto 16px;
+}
+
+.yoast #wpcontent .yoast-paper h2 {
+	margin-bottom: 16px;
+}
+
+.yoast-paper:last-of-type {
+	margin-bottom: 16px;
+}
+
+.yoast-feature:last-of-type {
+	margin-bottom: 16px;
+}
+
+.yoast-paper--bottom {
+	padding-bottom: 16px;
 }
 
 .yoast-paper--small {
@@ -20,8 +36,7 @@
 }
 
 .yoast-paper .yoast-notifications-dismissed {
-	width: calc(600px - 48px);
-	margin-bottom: 0;
+	margin-bottom: 16px;
 }
 
 .yoast-paper__item {
@@ -29,7 +44,6 @@
 }
 
 .yoast-paper #yoast-warnings-dismissed .collapsible-header {
-	font-size: 16px;
 	padding-bottom: 0;
 	border: 0;
 	margin-bottom: 0;
@@ -37,7 +51,7 @@
 
 .yoast-paper .toggleable-container-trigger {
 	background: none;
-	border: 0px;
+	border: 0;
 	width: 100%;
 	text-align: left;
 	color: var(--yoast-color-primary);
@@ -50,6 +64,9 @@
 	margin-bottom: 24px;
 }
 
+.yoast #wpcontent .paper-container h3:first-child {
+	padding-top: 0;
+}
 
 .yoast-paper__item .yoast-notification {
 	position: relative;
diff --git a/css/src/components/sidebar.css b/css/src/components/sidebar.css
index 154c910de88..1b4f9ad620f 100644
--- a/css/src/components/sidebar.css
+++ b/css/src/components/sidebar.css
@@ -18,6 +18,14 @@
 .yoast-sidebar {
 	max-width: 300px;
 	margin-left: 24px;
+	padding-top: 16px;
+}
+
+.yoast #wpcontent .yoast-sidebar h2 {
+	padding-top: 5px;
+	padding-bottom: 8px;
+	font-size: 1.1em;
+	font-weight: 400;
 }
 
 .yoast-main {
@@ -39,7 +47,7 @@
 .yoast-sidebar li {
 	position: relative;
 	margin-left: 18px;
-	font-weight: 600;
+	font-weight: 500;
 }
 
 .yoast-sidebar li::before {
@@ -54,6 +62,14 @@
 	margin-bottom: 24px;
 }
 
+.yoast-sidebar__plugins:last-of-type {
+	margin-bottom: 0;
+}
+
+.yoast #wpcontent .yoast-sidebar__plugins p {
+	margin: 0;
+}
+
 .yoast-sidebar__plugins-content-left {
 	margin-right: 16px;
 }
diff --git a/css/src/components/table.css b/css/src/components/table.css
index b36956acb92..32bbc876ed5 100644
--- a/css/src/components/table.css
+++ b/css/src/components/table.css
@@ -29,7 +29,7 @@
 .yoast .yoast-table th a {
 	color: var(--yoast-color-dark);
 	padding: 0;
-	font-weight: 500;
+	font-weight: 300;
 }
 
 .yoast .yoast-table td {
diff --git a/css/src/components/tabs.css b/css/src/components/tabs.css
index f2fd762063f..d9448af3702 100644
--- a/css/src/components/tabs.css
+++ b/css/src/components/tabs.css
@@ -17,12 +17,13 @@
 	display: flex;
 	flex-wrap: wrap;
 	align-items: flex-end;
+	justify-content: center;
 	margin-bottom: 0;
 	margin-top: 0;
 	padding-top: 3px;
 	padding-left: 16px;
-	border-bottom: 1px solid var(--yoast-color-border);
-	min-height: 60px;
+	border-bottom: 1px solid #cccccc;
+	min-height: 45px;
 }
 
 .yoast-tabs__list-item {
@@ -32,7 +33,6 @@
 	border-top: var(--yoast-border-default);
 	border-right: var(--yoast-border-default);
 	border-left: var(--yoast-border-default);
-	box-shadow: 0 3px 6px rgba(0, 0, 0, 0.15);
 	margin-left: -1px;
 }
 
@@ -80,7 +80,8 @@
 	display: block;
 	color: var(--yoast-color-dark);
 	text-decoration: none;
-	padding: 12px 16px;
+	padding: 8px 12px;
+	font-size: 14px;
 }
 
 .yoast-tabs__list-item-link:hover {
@@ -90,6 +91,7 @@
 .yoast-tabs__list-item.yoast-tabs__list-item--active {
 	top: 1px;
 	background-color: var(--yoast-color-white);
+	box-shadow: var(--yoast-shadow-default);
 	z-index: 11;
 }
 
@@ -104,7 +106,8 @@
 
 .yoast-tabs__list-item--active .yoast-tabs__list-item-link {
 	color: var(--yoast-color-primary);
-	padding: 16px;
+	padding: 10px 16px;
+	font-size: 16px;
 }
 
 @media (max-width: 782px) {
diff --git a/css/src/components/toggle.css b/css/src/components/toggle.css
new file mode 100644
index 00000000000..4f75557ac55
--- /dev/null
+++ b/css/src/components/toggle.css
@@ -0,0 +1,11 @@
+.yoast-toggle--active, .yoast-toggle--inactive {
+	cursor: pointer;
+	user-select: none;
+}
+
+.yoast-toggle--inverse .yoast-toggle__checkbox ~ .yoast-toggle--active:hover,
+.yoast-toggle--inverse .yoast-toggle__checkbox ~ .yoast-toggle--inactive:hover,
+.yoast-toggle .yoast-toggle__checkbox ~ .yoast-toggle--active:hover,
+.yoast-toggle .yoast-toggle__checkbox ~ .yoast-toggle--inactive:hover {
+	color: var(--yoast-color-default-darker);
+}
diff --git a/inc/options/class-wpseo-option-social.php b/inc/options/class-wpseo-option-social.php
index eb8760d3650..a0801a53e2f 100644
--- a/inc/options/class-wpseo-option-social.php
+++ b/inc/options/class-wpseo-option-social.php
@@ -73,11 +73,6 @@ class WPSEO_Option_Social extends WPSEO_Option {
 	public static $twitter_card_types = [
 		'summary'             => '',
 		'summary_large_image' => '',
-		// 'photo'               => '',
-		// 'gallery'             => '',
-		// 'app'                 => '',
-		// 'player'              => '',
-		// 'product'             => '',
 	];
 
 	/**
diff --git a/js/src/components/LocalSEOUpsell.js b/js/src/components/LocalSEOUpsell.js
index a956a5d8d56..2a8858613b0 100644
--- a/js/src/components/LocalSEOUpsell.js
+++ b/js/src/components/LocalSEOUpsell.js
@@ -41,10 +41,12 @@ const TextContainer = styled.div`
 `;
 
 const Header = styled.h3`
+	.yoast #wpcontent h3&,
 	&& {
 		font-size: 1.15em;
 		font-weight: bold;
 		margin: 4px 0;
+		color: #333;
 	}
 `;
 
diff --git a/js/src/components/SnippetPreviewSection.js b/js/src/components/SnippetPreviewSection.js
index 9a439291d89..3993f6cc5ae 100644
--- a/js/src/components/SnippetPreviewSection.js
+++ b/js/src/components/SnippetPreviewSection.js
@@ -5,8 +5,6 @@ import { StyledSection, StyledHeading, StyledSectionBase } from "@yoast/componen
 import { getDirectionalStyle as getRtlStyle } from "@yoast/helpers";
 
 const Section = styled( StyledSection )`
-	max-width: 640px;
-	
 	&${ StyledSectionBase } {
 		padding: 0;
 		padding-bottom: 16px;
diff --git a/js/src/components/WordPressUserSelectorSearchAppearance.js b/js/src/components/WordPressUserSelectorSearchAppearance.js
index 00cdf95a403..ce661b4cfbd 100644
--- a/js/src/components/WordPressUserSelectorSearchAppearance.js
+++ b/js/src/components/WordPressUserSelectorSearchAppearance.js
@@ -3,6 +3,7 @@
 /* External dependencies */
 import { Component, Fragment } from "@wordpress/element";
 import { __, sprintf } from "@wordpress/i18n";
+import { Alert } from "@yoast/components";
 import interpolateComponents from "interpolate-components";
 
 /* Internal dependencies */
@@ -64,11 +65,9 @@ class WordPressUserSelectorSearchAppearance extends Component {
 			return null;
 		}
 
-		return (
-			<p className="error-message">
-				{ __( "Error: Please select a user below to make your site's meta data complete.", "wordpress-seo" ) }
-			</p>
-		);
+		return <Alert type={"warning"}>
+			{ __( "Please select a user below to make your site's meta data complete.", "wordpress-seo" ) }
+			</Alert>;
 	}
 
 	/**
@@ -111,11 +110,13 @@ class WordPressUserSelectorSearchAppearance extends Component {
 		return (
 			<Fragment>
 				{ this.renderError() }
+				<div className={"yoast-field-group__title"}>
 				<label
 					htmlFor="wpseo-person-selector-name"
 				>
-					{ __( "Name:", "wordpress-seo" ) }
+					{ __( "Name", "wordpress-seo" ) }
 				</label>
+				</div>
 				<WordPressUserSelector
 					hasLabel={ false }
 					name={ "wpseo-person-selector-name" }
diff --git a/js/src/initializers/admin.js b/js/src/initializers/admin.js
index 3af1089587e..69131046396 100644
--- a/js/src/initializers/admin.js
+++ b/js/src/initializers/admin.js
@@ -148,14 +148,7 @@ export default function initAdmin( jQuery ) {
 	 * @returns {void}
 	 */
 	function initSelect2() {
-		var select2Width = "400px";
-
-		// Select2 for Twitter card meta data in Settings
-		jQuery( "#twitter_card_type" ).select2( {
-			width: select2Width,
-			language: wpseoScriptData.userLanguageCode,
-			dropdownCssClass: "yoast-select__dropdown",
-		} );
+		var select2Width = "300px";
 
 		// Select2 for taxonomy breadcrumbs in Advanced
 		jQuery( "#breadcrumbs select" ).select2( {
@@ -207,6 +200,14 @@ export default function initAdmin( jQuery ) {
 		 */
 		wpseoSetTabHash();
 
+		jQuery( '.yoast-toggle--inactive' ).click( function() {
+			jQuery( this ).parent().find( 'input' ).prop( 'checked', false ).change();
+		} );
+
+		jQuery( '.yoast-toggle--active' ).click( function() {
+			jQuery( this ).parent().find( 'input' ).prop( 'checked', true ).change();
+		} );
+
 		// Toggle the Author archives section.
 		jQuery( "#disable-author" ).change( function() {
 			jQuery( "#author-archives-titles-metas-content" ).toggle( jQuery( this ).is( ":not(:checked)" ) );
@@ -217,6 +218,11 @@ export default function initAdmin( jQuery ) {
 			jQuery( "#noindex-author-noposts-wpseo-container" ).toggle( jQuery( this ).is( ":not(:checked)" ) );
 		} ).change();
 
+		// Toggle the Twitter card settings.
+		jQuery( "#twitter" ).change( function() {
+			jQuery( "#wpseo-twitter-settings" ).toggle( jQuery( this ).is( ":checked" ) );
+		} ).change();
+
 		// Toggle the Date archives section.
 		jQuery( "#disable-date" ).change( function() {
 			jQuery( "#date-archives-titles-metas-content" ).toggle( jQuery( this ).is( ":not(:checked)" ) );
@@ -255,20 +261,8 @@ export default function initAdmin( jQuery ) {
 			jQuery( window ).trigger( "yoast-seo-tab-change" );
 		} );
 
-		// Handle the Company or Person select.
-		jQuery( "#company_or_person" ).change( function() {
-			var companyOrPerson = jQuery( this ).val();
-			if ( "company" === companyOrPerson ) {
-				jQuery( "#knowledge-graph-company" ).show();
-				jQuery( "#knowledge-graph-person" ).hide();
-			} else if ( "person" === companyOrPerson ) {
-				jQuery( "#knowledge-graph-company" ).hide();
-				jQuery( "#knowledge-graph-person" ).show();
-			} else {
-				jQuery( "#knowledge-graph-company" ).hide();
-				jQuery( "#knowledge-graph-person" ).hide();
-			}
-		} ).change();
+		jQuery( "#company_or_person-company" ).change( togglePersonCompany );
+		jQuery( "#company_or_person-person" ).change( togglePersonCompany ).change();
 
 		// Check correct variables usage in title and description templates.
 		jQuery( ".template" ).on( "input", function() {
@@ -307,4 +301,26 @@ export default function initAdmin( jQuery ) {
 		setInitialActiveTab();
 		initSelect2();
 	} );
+
+	/**
+	 * Toggles the company and person detailled controls on/off.
+	 *
+	 * @returns {void}
+	 */
+	function togglePersonCompany() {
+		if ( jQuery( "#company_or_person-company" ).is( ":checked" ) ) {
+			jQuery("#knowledge-graph-company").show();
+			jQuery("#knowledge-graph-person").hide();
+			return;
+		}
+
+		if ( jQuery( "#company_or_person-person" ).is( ":checked" ) ) {
+			jQuery("#knowledge-graph-person").show();
+			jQuery("#knowledge-graph-company").hide();
+			return;
+		}
+
+		jQuery("#knowledge-graph-person").hide();
+		jQuery("#knowledge-graph-company").hide();
+	}
 }