diff --git a/couchpotato/core/media/_base/providers/torrent/torrentpotato.py b/couchpotato/core/media/_base/providers/torrent/torrentpotato.py
index fe0d5be..d142676 100644
--- a/couchpotato/core/media/_base/providers/torrent/torrentpotato.py
+++ b/couchpotato/core/media/_base/providers/torrent/torrentpotato.py
@@ -134,7 +134,7 @@ config = [{
             'order': 10,
             'description': 'CouchPotato torrent provider. Checkout <a href="https://github.com/RuudBurger/CouchPotatoServer/wiki/CouchPotato-Torrent-Provider">the wiki page about this provider</a> for more info.',
             'wizard': True,
-            'icon': '',
+            'icon': 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAABnRSTlMAAAAAAABupgeRAAABSElEQVR4AZ2Nz0oCURTGv8t1YMpqUxt9ARFxoQ/gQtppgvUKcu/sxB5iBJkogspaBC6iVUplEC6kv+oiiKDNhAtt16roP0HQgdsMLgaxfvy4nHP4Pi48qE2g4v91JOqT1CH/UnA7w7icUlLawyEdj+ZI/7h6YluWbRiddHonHh9M70aj7VTKzuXuikUMci/EO/ACnAI15599oAk8AR/AgxBQNCzreD7bmpl+FOIVuAHqQDUcJo+AK+CZFKLt95/MpSmMt0TiW9POxse6UvYZ6zB2wFgjFiNpOGesR0rZ0PVPXf8KhUCl22CwClz4eN8weoZBb9c0bdPsOWvHx/cYu9Y0CoNoZTJrwAbn5DrnZc6XOV+igVbnsgo0IxEomlJuA1vUIYGyq3PZBChwmExCUSmVZgMBDIUCK4UCFIv5vHIhm/XUDeAf/ADbcpd5+aXSWQAAAABJRU5ErkJggg==',
             'options': [
                 {
                     'name': 'enabled',
diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js
index 054f531..b9f72ab 100644
--- a/couchpotato/static/scripts/page/settings.js
+++ b/couchpotato/static/scripts/page/settings.js
@@ -120,7 +120,13 @@ Page.Settings = new Class({
 		var self = this;
 
 		self.tabs_container = new Element('ul.tabs');
-		self.containers = new Element('form.uniForm.containers').adopt(
+		self.containers = new Element('form.uniForm.containers', {
+			'events': {
+				'click:relay(.enabler.disabled h2)': function(e, el){
+					el.getPrevious().getElements('.check').fireEvent('click');
+				}
+			}
+		}).adopt(
 			new Element('label.advanced_toggle').adopt(
 				new Element('span', {
 					'text': 'Show advanced settings'
@@ -285,14 +291,23 @@ Page.Settings = new Class({
 			})
 		}
 
+		var icon;
+		if(group.icon){
+			icon = new Element('span.icon').grab(new Element('img', {
+				'src': 'data:image/png;base64,' + group.icon
+			}));
+		}
+
+		var label = new Element('span.group_label', {
+			'text': group.label || (group.name).capitalize()
+		})
 
 		return new Element('fieldset', {
 			'class': (group.advanced ? 'inlineLabels advanced' : 'inlineLabels') + ' group_' + (group.name || '') + ' subtab_' + (group.subtab || '')
 		}).grab(
-				new Element('h2', {
-					'text': group.label || (group.name).capitalize()
-				}).grab(hint)
-			);
+			new Element('h2').adopt(icon, label, hint)
+		);
+
 	},
 
 	createList: function(content_container){
diff --git a/couchpotato/static/style/settings.css b/couchpotato/static/style/settings.css
index 1f77b8e..50b305e 100644
--- a/couchpotato/static/style/settings.css
+++ b/couchpotato/static/style/settings.css
@@ -92,6 +92,22 @@
 				border-bottom: 1px solid #333;
 				box-shadow: 0 1px 0 rgba(255,255,255, 0.15);
 			}
+
+			.page fieldset h2 .icon {
+				vertical-align: bottom;
+				position: absolute;
+				left: -25px;
+				top: 3px;
+				background: #FFF;
+				border-radius: 2.5px;
+				line-height: 0;
+				overflow: hidden;
+			}
+
+				.page fieldset.enabler:hover h2 .icon {
+					display: none;
+				}
+
 			.page fieldset h2 .hint {
 				font-size: 12px;
 				margin-left: 10px;
@@ -200,17 +216,23 @@
 
 	.page .option_list .enabler.disabled {
 		display: inline-block;
-		margin: 3px 3px 3px 20px;
-		padding: 4px 0;
-		width: 173px;
+		padding: 4px 0 5px;
+		width: 24%;
 		vertical-align: top;
 	}
+		.page .option_list .enabler:not(.disabled) .icon {
+			display: none;
+		}
 
 		.page .option_list .enabler.disabled h2 {
+			cursor: pointer;
 			border: none;
 			box-shadow: none;
-			padding: 0 10px 0 25px;
+			padding: 0 10px 0 0;
 			font-size: 16px;
+			position: relative;
+			left: 25px;
+			margin-right: 25px;
 		}
 
 			.page .option_list .enabler:not(.disabled) h2 {