diff --git a/src/renderer/pages/player-page.js b/src/renderer/pages/player-page.js
index ccc73f1b..713ac697 100644
--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -329,7 +329,7 @@ function renderLoadingSpinner (state) {
 
   return (
     <div key='loading' className='media-stalled'>
-      <div key='loading-spinner' className='loading-spinner'>&nbsp;</div>
+      <div key='loading-spinner' className='loading-spinner' />
       <div key='loading-progress' className='loading-status ellipsis'>
         <span className='progress'>{fileProgress}%</span> downloaded
         <span> ↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
diff --git a/test/screenshots/darwin/add-torrent-0-percent.png b/test/screenshots/darwin/add-torrent-0-percent.png
index 7f9e85c6..864dcd41 100644
Binary files a/test/screenshots/darwin/add-torrent-0-percent.png and b/test/screenshots/darwin/add-torrent-0-percent.png differ
diff --git a/test/screenshots/darwin/add-torrent-100-percent.png b/test/screenshots/darwin/add-torrent-100-percent.png
index cc7c33aa..0bcacefa 100644
Binary files a/test/screenshots/darwin/add-torrent-100-percent.png and b/test/screenshots/darwin/add-torrent-100-percent.png differ
diff --git a/test/screenshots/darwin/app-basic.png b/test/screenshots/darwin/app-basic.png
index ca34124d..6c2b8926 100644
Binary files a/test/screenshots/darwin/app-basic.png and b/test/screenshots/darwin/app-basic.png differ
diff --git a/test/screenshots/darwin/create-torrent-100-percent.png b/test/screenshots/darwin/create-torrent-100-percent.png
index 84dc2ed0..f3d8a43e 100644
Binary files a/test/screenshots/darwin/create-torrent-100-percent.png and b/test/screenshots/darwin/create-torrent-100-percent.png differ
diff --git a/test/screenshots/darwin/create-torrent-advanced.png b/test/screenshots/darwin/create-torrent-advanced.png
index 3b33e274..4614d25c 100644
Binary files a/test/screenshots/darwin/create-torrent-advanced.png and b/test/screenshots/darwin/create-torrent-advanced.png differ
diff --git a/test/screenshots/darwin/create-torrent-simple.png b/test/screenshots/darwin/create-torrent-simple.png
index 7db9f474..ddc88d4b 100644
Binary files a/test/screenshots/darwin/create-torrent-simple.png and b/test/screenshots/darwin/create-torrent-simple.png differ
diff --git a/test/screenshots/darwin/play-torrent-bbb.png b/test/screenshots/darwin/play-torrent-bbb.png
index 7229d721..760e4c0d 100644
Binary files a/test/screenshots/darwin/play-torrent-bbb.png and b/test/screenshots/darwin/play-torrent-bbb.png differ
diff --git a/test/screenshots/darwin/play-torrent-return.png b/test/screenshots/darwin/play-torrent-return.png
index fae9865d..a4cb38fa 100644
Binary files a/test/screenshots/darwin/play-torrent-return.png and b/test/screenshots/darwin/play-torrent-return.png differ
diff --git a/test/screenshots/darwin/play-torrent-wired-2.png b/test/screenshots/darwin/play-torrent-wired-2.png
index 0f0e090d..47f5264d 100644
Binary files a/test/screenshots/darwin/play-torrent-wired-2.png and b/test/screenshots/darwin/play-torrent-wired-2.png differ
diff --git a/test/screenshots/darwin/play-torrent-wired-3.png b/test/screenshots/darwin/play-torrent-wired-3.png
index 3fe120b9..c08acdce 100644
Binary files a/test/screenshots/darwin/play-torrent-wired-3.png and b/test/screenshots/darwin/play-torrent-wired-3.png differ
diff --git a/test/screenshots/darwin/play-torrent-wired-4.png b/test/screenshots/darwin/play-torrent-wired-4.png
index 3fe120b9..c08acdce 100644
Binary files a/test/screenshots/darwin/play-torrent-wired-4.png and b/test/screenshots/darwin/play-torrent-wired-4.png differ
diff --git a/test/screenshots/darwin/play-torrent-wired-5.png b/test/screenshots/darwin/play-torrent-wired-5.png
index 3fe120b9..c08acdce 100644
Binary files a/test/screenshots/darwin/play-torrent-wired-5.png and b/test/screenshots/darwin/play-torrent-wired-5.png differ
diff --git a/test/screenshots/darwin/play-torrent-wired-fullscreen.png b/test/screenshots/darwin/play-torrent-wired-fullscreen.png
index f11590b2..97b16de8 100644
Binary files a/test/screenshots/darwin/play-torrent-wired-fullscreen.png and b/test/screenshots/darwin/play-torrent-wired-fullscreen.png differ
diff --git a/test/screenshots/darwin/play-torrent-wired-list.png b/test/screenshots/darwin/play-torrent-wired-list.png
index e4b8d2bf..5c3f9ea2 100644
Binary files a/test/screenshots/darwin/play-torrent-wired-list.png and b/test/screenshots/darwin/play-torrent-wired-list.png differ
diff --git a/test/screenshots/darwin/play-torrent-wired.png b/test/screenshots/darwin/play-torrent-wired.png
index 4caf894a..a707104e 100644
Binary files a/test/screenshots/darwin/play-torrent-wired.png and b/test/screenshots/darwin/play-torrent-wired.png differ
diff --git a/test/screenshots/darwin/prefs-basic.png b/test/screenshots/darwin/prefs-basic.png
index 77abfab4..f3823e99 100644
Binary files a/test/screenshots/darwin/prefs-basic.png and b/test/screenshots/darwin/prefs-basic.png differ
diff --git a/test/screenshots/darwin/torrent-list-cosmos-delete-data.png b/test/screenshots/darwin/torrent-list-cosmos-delete-data.png
index e52438f7..30dac5a9 100644
Binary files a/test/screenshots/darwin/torrent-list-cosmos-delete-data.png and b/test/screenshots/darwin/torrent-list-cosmos-delete-data.png differ
diff --git a/test/screenshots/darwin/torrent-list-cosmos-deleted.png b/test/screenshots/darwin/torrent-list-cosmos-deleted.png
index 41880966..0bd1bff8 100644
Binary files a/test/screenshots/darwin/torrent-list-cosmos-deleted.png and b/test/screenshots/darwin/torrent-list-cosmos-deleted.png differ
diff --git a/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png b/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png
index 9a0cdf67..2e7b49d2 100644
Binary files a/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png and b/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png differ
diff --git a/test/screenshots/darwin/torrent-list-cosmos-expand-start.png b/test/screenshots/darwin/torrent-list-cosmos-expand-start.png
index c679b947..5422bc8d 100644
Binary files a/test/screenshots/darwin/torrent-list-cosmos-expand-start.png and b/test/screenshots/darwin/torrent-list-cosmos-expand-start.png differ
diff --git a/test/screenshots/darwin/torrent-list-cosmos-expand.png b/test/screenshots/darwin/torrent-list-cosmos-expand.png
index fc6e27ec..01226d7f 100644
Binary files a/test/screenshots/darwin/torrent-list-cosmos-expand.png and b/test/screenshots/darwin/torrent-list-cosmos-expand.png differ
diff --git a/test/screenshots/darwin/torrent-list-cosmos-hover.png b/test/screenshots/darwin/torrent-list-cosmos-hover.png
deleted file mode 100644
index 7427b20a..00000000
Binary files a/test/screenshots/darwin/torrent-list-cosmos-hover.png and /dev/null differ
diff --git a/test/screenshots/darwin/torrent-list-delete-prompt.png b/test/screenshots/darwin/torrent-list-delete-prompt.png
index b61cfde7..aed81fdb 100644
Binary files a/test/screenshots/darwin/torrent-list-delete-prompt.png and b/test/screenshots/darwin/torrent-list-delete-prompt.png differ
diff --git a/test/screenshots/darwin/torrent-list-deleted.png b/test/screenshots/darwin/torrent-list-deleted.png
index fae9865d..a4cb38fa 100644
Binary files a/test/screenshots/darwin/torrent-list-deleted.png and b/test/screenshots/darwin/torrent-list-deleted.png differ
diff --git a/test/screenshots/darwin/torrent-list-download-path-missing.png b/test/screenshots/darwin/torrent-list-download-path-missing.png
index 0ee02e10..a0bcca4d 100644
Binary files a/test/screenshots/darwin/torrent-list-download-path-missing.png and b/test/screenshots/darwin/torrent-list-download-path-missing.png differ
diff --git a/test/screenshots/darwin/torrent-list-download.png b/test/screenshots/darwin/torrent-list-download.png
new file mode 100644
index 00000000..22e9d4dc
Binary files /dev/null and b/test/screenshots/darwin/torrent-list-download.png differ
diff --git a/test/screenshots/darwin/torrent-list-hover-download.png b/test/screenshots/darwin/torrent-list-hover-download.png
deleted file mode 100644
index ab47431a..00000000
Binary files a/test/screenshots/darwin/torrent-list-hover-download.png and /dev/null differ
diff --git a/test/screenshots/darwin/torrent-list-hover.png b/test/screenshots/darwin/torrent-list-hover.png
deleted file mode 100644
index d5780876..00000000
Binary files a/test/screenshots/darwin/torrent-list-hover.png and /dev/null differ
diff --git a/test/screenshots/darwin/torrent-list-start-download.png b/test/screenshots/darwin/torrent-list-start-download.png
index 2e202f60..0c18744b 100644
Binary files a/test/screenshots/darwin/torrent-list-start-download.png and b/test/screenshots/darwin/torrent-list-start-download.png differ
diff --git a/test/screenshots/darwin/torrent-list.png b/test/screenshots/darwin/torrent-list.png
new file mode 100644
index 00000000..1d9e02f0
Binary files /dev/null and b/test/screenshots/darwin/torrent-list.png differ
diff --git a/test/test-add-torrent.js b/test/test-add-torrent.js
index c8d7bd3e..12a60569 100644
--- a/test/test-add-torrent.js
+++ b/test/test-add-torrent.js
@@ -40,10 +40,9 @@ test('create-torrent', function (t) {
     announce: [
       'udp://explodie.org:6969',
       'udp://tracker.coppersurfer.tk:6969',
+      'udp://tracker.empire-js.us:1337',
       'udp://tracker.leechers-paradise.org:6969',
-      'udp://tracker.openbittorrent.com:80',
       'udp://tracker.opentrackr.org:1337',
-      'udp://zer0day.ch:1337',
       'wss://tracker.btorrent.xyz',
       'wss://tracker.fastcast.nz',
       'wss://tracker.openwebtorrent.com'
diff --git a/test/test-torrent-list.js b/test/test-torrent-list.js
index b3b8fe5e..3ae6fac3 100644
--- a/test/test-torrent-list.js
+++ b/test/test-torrent-list.js
@@ -31,22 +31,20 @@ test('torrent-list: start, stop, and delete torrents', function (t) {
   const app = setup.createApp()
   setup.waitForLoad(app, t)
     .then(() => app.client.waitUntilTextExists('.torrent-list', 'Big Buck Bunny'))
-    // Mouse over the first torrent
-    .then(() => app.client.moveToObject('.torrent'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-hover'))
+    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list'))
     // Click download on the first torrent, start downloading
     .then(() => app.client.click('.download input'))
     .then(() => app.client.waitUntilTextExists('.torrent-list', '276 MB'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-start-download'))
     // Click download on the first torrent again, stop downloading
     .then(() => app.client.click('.download input'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-hover-download'))
+    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-download'))
     // Click delete on the first torrent
     .then(() => app.client.click('.icon.delete'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-delete-prompt'))
     // Click cancel on the resulting confirmation dialog. Should be same as before.
     .then(() => app.client.click('.control.cancel'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-hover'))
+    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list'))
     // Click delete on the first torrent again
     .then(() => app.client.click('.icon.delete'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-delete-prompt'))
@@ -63,9 +61,6 @@ test('torrent-list: expand torrent, unselect file', function (t) {
   const app = setup.createApp()
   setup.waitForLoad(app, t)
     .then(() => app.client.waitUntilTextExists('.torrent-list', 'Big Buck Bunny'))
-    // Mouse over the torrent
-    .then(() => app.client.moveToObject('#torrent-cosmos'))
-    .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-cosmos-hover'))
     // Click on the torrent, expand
     .then(() => app.client.click('#torrent-cosmos'))
     .then(() => setup.screenshotCreateOrCompare(app, t, 'torrent-list-cosmos-expand'))