diff --git a/gui/slick/images/providers/french-adn.png b/gui/slick/images/providers/french-adn.png
new file mode 100644
index 0000000000..521edbf50a
Binary files /dev/null and b/gui/slick/images/providers/french-adn.png differ
diff --git a/gui/slick/images/providers/french-adn_com.png b/gui/slick/images/providers/french-adn_com.png
new file mode 100644
index 0000000000..521edbf50a
Binary files /dev/null and b/gui/slick/images/providers/french-adn_com.png differ
diff --git a/gui/slick/images/providers/torrentshack.png b/gui/slick/images/providers/torrentshack.png
new file mode 100644
index 0000000000..318bbc2b23
Binary files /dev/null and b/gui/slick/images/providers/torrentshack.png differ
diff --git a/gui/slick/images/providers/torrentshack_me.png b/gui/slick/images/providers/torrentshack_me.png
new file mode 100644
index 0000000000..318bbc2b23
Binary files /dev/null and b/gui/slick/images/providers/torrentshack_me.png differ
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 6a16cdffb5..ebbc322db3 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -88,8 +88,12 @@
 from tornado.web import RequestHandler, HTTPError, authenticated
 from tornado.gen import coroutine
 from tornado.ioloop import IOLoop
-from tornado.concurrent import run_on_executor
+
 from concurrent.futures import ThreadPoolExecutor
+from tornado.process import cpu_count
+
+from tornado.concurrent import run_on_executor
+
 from mako.runtime import UNDEFINED
 
 mako_lookup = None
@@ -255,7 +259,7 @@ def __init__(self, *args, **kwargs):
         super(WebHandler, self).__init__(*args, **kwargs)
         self.io_loop = IOLoop.current()
 
-    executor = ThreadPoolExecutor(50)
+    executor = ThreadPoolExecutor(cpu_count())
 
     @authenticated
     @coroutine