Index: src/wp-admin/edit.php
===================================================================
--- src/wp-admin/edit.php	(revision 34665)
+++ src/wp-admin/edit.php	(working copy)
@@ -195,7 +195,7 @@
 		'<ul>' .
 			'<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
 			'<li>' . __('You can filter the list of posts by post status using the text links in the upper left to show All, Published, Draft, or Trashed posts. The default view is to show all posts.') . '</li>' .
-			'<li>' . __('You can view posts in a simple title list or with an excerpt. Choose the view you prefer by clicking on the icons at the top of the list on the right.') . '</li>' .
+			'<li>' . __('You can view posts in a simple title list or with an excerpt using the Screen Options tab.') . '</li>' .
 			'<li>' . __('You can refine the list to show only posts in a specific category or from a specific month by using the dropdown menus above the posts list. Click the Filter button after making your selection. You also can refine the list by clicking on the post author, category or tag in the posts list.') . '</li>' .
 		'</ul>'
 	) );
@@ -218,7 +218,6 @@
 		'<p>' . __('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.') . '</p>' .
 				'<p>' . __('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>'
 	) );
-
 	get_current_screen()->set_help_sidebar(
 	'<p><strong>' . __('For more information:') . '</strong></p>' .
 	'<p>' . __('<a href="https://codex.wordpress.org/Posts_Screen" target="_blank">Documentation on Managing Posts</a>') . '</p>' .
Index: src/wp-admin/includes/class-wp-posts-list-table.php
===================================================================
--- src/wp-admin/includes/class-wp-posts-list-table.php	(revision 34665)
+++ src/wp-admin/includes/class-wp-posts-list-table.php	(working copy)
@@ -472,9 +472,6 @@
 		global $mode;
 
 		parent::pagination( $which );
-
-		if ( 'top' === $which && ! is_post_type_hierarchical( $this->screen->post_type ) )
-			$this->view_switcher( $mode );
 	}
 
 	/**
Index: src/wp-admin/includes/class-wp-screen.php
===================================================================
--- src/wp-admin/includes/class-wp-screen.php	(revision 34665)
+++ src/wp-admin/includes/class-wp-screen.php	(working copy)
@@ -896,6 +896,7 @@
 	 */
 	public function render_screen_options( $options = array() ) {
 		global $wp_meta_boxes;
+		global $mode;
 		$options = wp_parse_args( $options, array(
 			'wrap' => true,
 		) );
@@ -960,12 +961,34 @@
 				?>
 				<br class="clear" />
 			</div>
-		<?php endif;
+		<?php endif; ?>
+			
+		<?php
+		/**
+		 * Filter the post types that have different view mode options.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param array $view_mode_post_types Array of post types that can change view modes.
+		 */
+		$view_mode_post_types = apply_filters( 'view_mode_post_types', array( 'post' ) );
+		if ( in_array( $this->post_type, $view_mode_post_types ) ) { ?>
+		<div class="view-modes">
+			<h5>View Mode</h5>
+			<label for="list-view-mode">
+				<input id="list-view-mode" type="radio" name="mode" value="list" <?php checked( 'list', $mode ); ?> />
+				List View
+			</label>
+			<label for="excerpt-view-mode">
+				<input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked( 'excerpt', $mode ); ?> />
+				Excerpt View
+			</label>
+		</div>
+		<?php }
 
 		$this->render_screen_layout();
 		$this->render_per_page_options();
 		echo $this->_screen_settings;
-
 		?>
 		<div><?php wp_nonce_field( 'screen-options-nonce', 'screenoptionnonce', false ); ?></div>
 		</form>
Index: src/wp-admin/includes/misc.php
===================================================================
--- src/wp-admin/includes/misc.php	(revision 34665)
+++ src/wp-admin/includes/misc.php	(working copy)
@@ -438,7 +438,13 @@
 		}
 
 		update_user_meta($user->ID, $option, $value);
-		wp_safe_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
+
+		$url = remove_query_arg( array( 'pagenum', 'apage', 'paged' ), wp_get_referer() );
+		if ( isset( $_POST['mode'] ) ) {
+			$url = add_query_arg( array( 'mode' => $_POST['mode'] ), $url );
+		}
+
+		wp_safe_redirect( $url );
 		exit;
 	}
 }