WP-2961: change markup and preview thumbnail.