diff --git a/www/src/assets/v2icon.svg b/www/src/assets/v2icon.svg
new file mode 100644
index 0000000000000..359c04f7608a2
--- /dev/null
+++ b/www/src/assets/v2icon.svg
@@ -0,0 +1,6 @@
+<svg width="36" height="21" viewBox="0 0 36 21" fill="none" xmlns="http://www.w3.org/2000/svg"><rect y="2" width="36" height="16" rx="8" fill="#F5F3F7"/>
+  <path d="M18.1009 8.51259L20.7529 14.2586L23.4049 8.51259H22.3649L20.7529 12.1526L19.1409 8.51259H18.1009ZM29.7597 13.9076V13.0236H26.0937L27.9007 10.9826C28.2517 10.5796 28.7197 10.0466 29.0837 9.53959C29.6037 8.79859 29.7727 8.26559 29.7727 7.68059C29.7727 6.18559 28.6287 5.09359 27.0947 5.09359C26.0157 5.09359 25.4047 5.56159 25.0407 5.97759C24.7027 6.36759 24.4297 6.90059 24.3907 7.77159H25.3527C25.3657 7.32959 25.4697 7.00459 25.6387 6.74459C25.9637 6.25059 26.4707 5.97759 27.0817 5.97759C28.1087 5.97759 28.8107 6.69259 28.8107 7.66759C28.8107 8.01859 28.7197 8.43459 28.3297 8.99359C28.1217 9.30559 27.5367 9.99459 27.3157 10.2546L24.1567 13.9076H29.7597Z" fill="#9B9B9B"/>
+  <path d="M14.1143 10H10.1143V11.1429H12.8572C12.4572 12.8572 11.2 14.2857 9.54287 14.8572L2.97144 8.28572C3.65715 6.28572 5.60001 4.85715 7.82858 4.85715C9.54287 4.85715 11.0857 5.71429 12.0572 7.02858L12.9143 6.28572C11.7714 4.74287 9.94287 3.71429 7.82858 3.71429C4.85715 3.71429 2.34287 5.82858 1.71429 8.62858L9.25715 16.1714C12 15.4857 14.1143 12.9714 14.1143 10Z" fill="#9B9B9B"/>
+  <path d="M1.71429 10.5714C1.71429 12.1714 2.34287 13.7143 3.54287 14.9143C4.74287 16.1143 6.34287 16.7428 7.88572 16.7428L1.71429 10.5714Z" fill="#9B9B9B"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M8 2C3.59998 2 0 5.59998 0 10C0 14.4 3.59998 18 8 18C12.4 18 16 14.4 16 10C16 5.59998 12.4 2 8 2ZM3.54285 14.4571C2.3429 13.2571 1.71429 11.6571 1.71429 10.1143L7.94287 16.2857C6.3429 16.2285 4.74286 15.6571 3.54285 14.4571ZM1.88574 8.6286L9.37146 16.1143C12.1714 15.4857 14.2858 12.9714 14.2858 10H10.2858V11.1429H13.0286C12.6286 12.8572 11.3715 14.2857 9.71429 14.8572L3.14288 8.28571C3.88574 6.28571 5.77148 4.85718 8 4.85718C9.71429 4.85718 11.2571 5.71429 12.2286 7.02856L13.0858 6.28571C11.9429 4.74286 10.1143 3.71429 8 3.71429C5.02863 3.71429 2.51434 5.82855 1.88574 8.6286Z" fill="#F5F3F7"/>
+</svg>
diff --git a/www/src/views/starter-library/starter-list.js b/www/src/views/starter-library/starter-list.js
index 128d2a4dc14a7..b4d66ef5a19fd 100644
--- a/www/src/views/starter-library/starter-list.js
+++ b/www/src/views/starter-library/starter-list.js
@@ -2,14 +2,13 @@ import React from "react"
 import { Link } from "gatsby"
 import LaunchDemoIcon from "react-icons/lib/md/launch"
 import GithubIcon from "react-icons/lib/go/mark-github"
-import CopyToClipboardIcon from "react-icons/lib/go/clippy"
 import MdStar from "react-icons/lib/md/star"
-import { options } from "../../utils/typography"
+import { options, rhythm } from "../../utils/typography"
 import { colors } from "../../utils/presets"
-import copyToClipboard from "../../utils/copy-to-clipboard"
 import styles from "../shared/styles"
 import ThumbnailLink from "../shared/thumbnail"
 import EmptyGridItems from "../shared/empty-grid-items"
+import V2Icon from "../../assets/v2icon.svg"
 import get from "lodash/get"
 
 const StartersList = ({ urlState, starters, count, sortRecent }) => {
@@ -89,45 +88,31 @@ const StartersList = ({ urlState, starters, count, sortRecent }) => {
                     css={{ display: `flex`, justifyContent: `space-between` }}
                   >
                     <span css={{ color: colors.gray.dark }}>{owner} /</span>
-                    <span>
-                      <a
-                        href="#copy-to-clipboard"
-                        onClick={() =>
-                          copyToClipboard(
-                            `https://github.com/${githubFullName}`
-                          )
-                        }
-                        css={{ ...styles.shortcutIcon }}
-                      >
-                        <CopyToClipboardIcon />
-                      </a>
-                      {` `}
-                      <a
-                        href={demoUrl}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        css={{ ...styles.shortcutIcon }}
-                      >
-                        <LaunchDemoIcon />
-                      </a>
-                      {` `}
-                      <a
-                        href={`https://github.com/${githubFullName}`}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        css={{ ...styles.shortcutIcon }}
-                      >
-                        <GithubIcon />
-                        {` `}
-                      </a>
+                    <span css={{ display: `flex` }}>
+                      {gatsbyMajorVersion[0][1] === `2` && (
+                        <img
+                          src={V2Icon}
+                          alt="Gatsby v2"
+                          css={{ marginBottom: 0, marginRight: rhythm(2 / 8) }}
+                        />
+                      )}
+                      <div css={{ display: `inline-block` }}>
+                        <MdStar
+                          style={{
+                            color: colors.gray.light,
+                            verticalAlign: `text-top`,
+                          }}
+                        />
+                        {stars}
+                      </div>
                     </span>
                   </div>
                   <div>
-                    <span className="title">
+                    <Link to={`/starters/${stub}`}>
                       <h5 css={{ margin: 0 }}>
-                        <strong>{name}</strong>
+                        <strong className="title">{name}</strong>
                       </h5>
-                    </span>
+                    </Link>
                     {/* {isGatsbyVersionWarning ?
                         <span css={{ fontStyle: `italic`, color: `red` }}>Outdated Version: {minorVersion}</span> :
                         <span css={{ fontStyle: `italic`, color: `green` }}>Gatsby Version: {minorVersion}</span>
@@ -138,6 +123,7 @@ const StartersList = ({ urlState, starters, count, sortRecent }) => {
                       textOverflow: `ellipsis`,
                       overflow: `hidden`,
                       whiteSpace: `nowrap`,
+                      marginBottom: rhythm(1 / 8),
                     }}
                   >
                     {description || `No description`}
@@ -145,21 +131,34 @@ const StartersList = ({ urlState, starters, count, sortRecent }) => {
                   <div
                     css={{ display: `flex`, justifyContent: `space-between` }}
                   >
-                    <div css={{ display: `inline-block` }}>
-                      <MdStar
-                        style={{
-                          color: colors.accent,
-                          verticalAlign: `text-top`,
-                        }}
-                      />
-                      {stars}
-                    </div>
-                    <div css={{ display: `inline-block` }}>
-                      {`Gatsby v${gatsbyMajorVersion[0][1]}`}
-                    </div>
                     <div css={{ display: `inline-block` }}>
                       Updated {new Date(lastUpdated).toLocaleDateString()}
                     </div>
+                    <span>
+                      <a
+                        href={`https://github.com/${githubFullName}`}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        css={{
+                          ...styles.shortcutIcon,
+                          svg: { verticalAlign: `text-top !important` },
+                        }}
+                      >
+                        <GithubIcon />
+                      </a>
+                      {` `}
+                      <a
+                        href={demoUrl}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        css={{
+                          ...styles.shortcutIcon,
+                          svg: { verticalAlign: `text-top !important` },
+                        }}
+                      >
+                        <LaunchDemoIcon />
+                      </a>
+                    </span>
                   </div>
                 </div>
               </div>