diff --git a/.gitignore b/.gitignore
index 30df881848..ff75f2a43a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,5 @@ common/vendor.js
 *.update.rdf
 system-addon/data/content/activity-stream.bundle.js
 system-addon/data/content/activity-stream.css
-system-addon/data/content/tippytop
 system-addon/data/locales.json
 pocket.json
diff --git a/package.json b/package.json
index d7ecbee5e1..9a72ee19a8 100644
--- a/package.json
+++ b/package.json
@@ -267,7 +267,7 @@
     "tippymc:manifest": "cpx \"node_modules/tippy-top-sites/top_sites.json\" system-addon/data/content/tippytop",
     "tippymc:images": "cpx \"node_modules/tippy-top-sites/images/**/*\" system-addon/data/content/tippytop/images",
     "buildmc": "npm-run-all buildmc:*",
-    "prebuildmc": "npm run cleanmc && npm run tippymc",
+    "prebuildmc": "npm run cleanmc",
     "buildmc:webpack": "webpack --config webpack.system-addon.config.js",
     "buildmc:css": "node-sass system-addon/content-src/activity-stream.scss -o system-addon/data/content",
     "buildmc:locales": "pontoon-to-json --src locales --dest system-addon/data",
diff --git a/system-addon/content-src/components/TopSites/_TopSites.scss b/system-addon/content-src/components/TopSites/_TopSites.scss
index 144a46e44e..5f881eae37 100644
--- a/system-addon/content-src/components/TopSites/_TopSites.scss
+++ b/system-addon/content-src/components/TopSites/_TopSites.scss
@@ -4,7 +4,7 @@
   $top-sites-title-height: 30px;
   $top-sites-vertical-space: 18px;
   $screenshot-size: cover;
-  $tippy-top-size: 80px;
+  $tippy-top-size: 96px;
 
   list-style: none;
   margin: 0;
diff --git a/system-addon/data/content/tippytop/images/amazon-com@2x.png b/system-addon/data/content/tippytop/images/amazon-com@2x.png
new file mode 100644
index 0000000000..6e3ffe0c98
Binary files /dev/null and b/system-addon/data/content/tippytop/images/amazon-com@2x.png differ
diff --git a/system-addon/data/content/tippytop/images/facebook-com@2x.png b/system-addon/data/content/tippytop/images/facebook-com@2x.png
new file mode 100644
index 0000000000..7c9685cccf
Binary files /dev/null and b/system-addon/data/content/tippytop/images/facebook-com@2x.png differ
diff --git a/system-addon/data/content/tippytop/images/reddit-com@2x.png b/system-addon/data/content/tippytop/images/reddit-com@2x.png
new file mode 100644
index 0000000000..528309bfe3
Binary files /dev/null and b/system-addon/data/content/tippytop/images/reddit-com@2x.png differ
diff --git a/system-addon/data/content/tippytop/images/twitter-com@2x.png b/system-addon/data/content/tippytop/images/twitter-com@2x.png
new file mode 100644
index 0000000000..7792839db1
Binary files /dev/null and b/system-addon/data/content/tippytop/images/twitter-com@2x.png differ
diff --git a/system-addon/data/content/tippytop/images/wikipedia-com@2x.png b/system-addon/data/content/tippytop/images/wikipedia-com@2x.png
new file mode 100644
index 0000000000..576f0a7b27
Binary files /dev/null and b/system-addon/data/content/tippytop/images/wikipedia-com@2x.png differ
diff --git a/system-addon/data/content/tippytop/images/youtube-com@2x.png b/system-addon/data/content/tippytop/images/youtube-com@2x.png
new file mode 100644
index 0000000000..3c26bfd19e
Binary files /dev/null and b/system-addon/data/content/tippytop/images/youtube-com@2x.png differ
diff --git a/system-addon/data/content/tippytop/top_sites.json b/system-addon/data/content/tippytop/top_sites.json
new file mode 100644
index 0000000000..7798220348
--- /dev/null
+++ b/system-addon/data/content/tippytop/top_sites.json
@@ -0,0 +1,32 @@
+[
+  {
+    "title": "amazon",
+    "urls": ["https://www.amazon.com/", "https://www.amazon.ca/", "https://www.amazon.de/", "https://www.amazon.co.uk/", "https://www.amazon.fr/"],
+    "image_url": "amazon-com@2x.png"
+  },
+  {
+    "title": "facebook",
+    "url": "https://www.facebook.com/",
+    "image_url": "facebook-com@2x.png"
+  },
+  {
+    "title": "reddit",
+    "url": "https://www.reddit.com/",
+    "image_url": "reddit-com@2x.png"
+  },
+  {
+    "title": "twitter",
+    "url": "https://twitter.com/",
+    "image_url": "twitter-com@2x.png"
+  },
+  {
+    "title": "youtube",
+    "url": "https://www.youtube.com/",
+    "image_url": "youtube-com@2x.png"
+  },
+  {
+    "title": "wikipedia",
+    "url": "https://www.wikipedia.org/",
+    "image_url": "wikipedia-com@2x.png"
+  }
+]
diff --git a/yamscripts.yml b/yamscripts.yml
index aad16300cb..1a4bb3705d 100644
--- a/yamscripts.yml
+++ b/yamscripts.yml
@@ -49,7 +49,7 @@ scripts:
 
 # buildmc: Export the bootstraped add-on to mozilla central
   buildmc:
-    pre: =>cleanmc && =>tippymc
+    pre: =>cleanmc
     webpack: webpack --config webpack.system-addon.config.js
     css: node-sass system-addon/content-src/activity-stream.scss -o system-addon/data/content
     locales: pontoon-to-json --src locales --dest system-addon/data