Wizard and blank state

assets/css/admin.scss

@@ -4965,6 +4965,7 @@ table.bar_chart {
 		font-size: 1.2em;
 		padding: 0.75em 1.5em;
 		height: auto;
+		display: inline-block !important
 	}
 }
 

assets/css/wc-setup.scss

@@ -16,6 +16,7 @@ body {
 .wc-setup-content {
 	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.13);
 	padding: 24px 24px 0;
+	margin: 0 0 20px;
 	background: #fff;
 	overflow: hidden;
 	zoom: 1;
@@ -238,11 +239,6 @@ body {
 			}
 			.setup-product {
 				a {
-					background-color: #bb77ae;
-					border-color: #a36597;
-					-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
-					box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
-					text-shadow: 0 -1px 1px #a36597, 1px 0 1px #a36597, 0 1px 1px #a36597, -1px 0 1px #a36597;
 					font-size: 1em;
 					height: auto;
 					line-height: 1.75em;
@@ -250,6 +246,13 @@ body {
 					opacity: 1;
 					padding: 1em;
 					text-align: center;
+				}
+				a.button-primary {
+					background-color: #bb77ae;
+					border-color: #a36597;
+					-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+					box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
+					text-shadow: 0 -1px 1px #a36597, 1px 0 1px #a36597, 0 1px 1px #a36597, -1px 0 1px #a36597;
 
 					&:hover, &:focus, &:active {
 						background: #a36597;

assets/js/admin/woocommerce_admin.js

@@ -3,10 +3,15 @@ jQuery( function ( $ ) {
 
 	// Add buttons to product screen.
 	var $product_screen = $( '.edit-php.post-type-product' ),
-		$title_action   = $product_screen.find( '.page-title-action:first' );
+		$title_action   = $product_screen.find( '.page-title-action:first' ),
+		$blankslate     = $product_screen.find( '.woocommerce-BlankState' );
 
-	$title_action.after( '<a href="' + woocommerce_admin.urls.export_products + '" class="page-title-action">' + woocommerce_admin.strings.export_products + '</a>' );
+	if ( 0 === $blankslate.length ) {
-	$title_action.after( '<a href="' + woocommerce_admin.urls.import_products + '" class="page-title-action">' + woocommerce_admin.strings.import_products + '</a>' );
+		$title_action.after( '<a href="' + woocommerce_admin.urls.export_products + '" class="page-title-action">' + woocommerce_admin.strings.export_products + '</a>' );
+		$title_action.after( '<a href="' + woocommerce_admin.urls.import_products + '" class="page-title-action">' + woocommerce_admin.strings.import_products + '</a>' );
+	} else {
+		$title_action.hide();
+	}
 
 	// Field validation error tips
 	$( document.body )

includes/admin/class-wc-admin-post-types.php

@@ -1946,6 +1946,7 @@ class WC_Admin_Post_Types {
 					?>
 					<h2 class="woocommerce-BlankState-message"><?php _e( 'Ready to start selling something awesome?', 'woocommerce' ); ?></h2>
 					<a class="woocommerce-BlankState-cta button-primary button" href="<?php echo esc_url( admin_url( 'post-new.php?post_type=product&tutorial=true' ) ); ?>"><?php _e( 'Create your first product!', 'woocommerce' ); ?></a>
+					<a class="woocommerce-BlankState-cta button" href="<?php echo esc_url( admin_url( 'edit.php?post_type=product&page=product_importer' ) ); ?>"><?php _e( 'Import products from a CSV file', 'woocommerce' ); ?></a>
 					<?php
 				break;
 			}

includes/admin/class-wc-admin-setup-wizard.php

@@ -804,6 +804,7 @@ class WC_Admin_Setup_Wizard {
 				<h2><?php esc_html_e( 'Next steps', 'woocommerce' ); ?></h2>
 				<ul>
 					<li class="setup-product"><a class="button button-primary button-large" href="<?php echo esc_url( admin_url( 'post-new.php?post_type=product&tutorial=true' ) ); ?>"><?php esc_html_e( 'Create your first product!', 'woocommerce' ); ?></a></li>
+					<li class="setup-product"><a class="button button-large" href="<?php echo esc_url( admin_url( 'edit.php?post_type=product&page=product_importer' ) ); ?>"><?php esc_html_e( 'Import products from a CSV file', 'woocommerce' ); ?></a></li>
 				</ul>
 			</div>
 			<div class="wc-setup-next-steps-last">