diff --git a/src/webui/static/app/esfilter.js b/src/webui/static/app/esfilter.js
index 2972c48e..c71ad0c4 100644
--- a/src/webui/static/app/esfilter.js
+++ b/src/webui/static/app/esfilter.js
@@ -86,6 +86,7 @@ tvheadend.esfilter_tab = function(panel)
         url: 'api/esfilter/teletext',
         titleS: 'Teletext Stream Filter',
         titleP: 'Teletext Stream Filters',
+		iconCls: 'teletext',
         tabIndex: 3,
         edit: { params: { list: eslist } },
         add: {
@@ -104,6 +105,7 @@ tvheadend.esfilter_tab = function(panel)
         url: 'api/esfilter/subtit',
         titleS: 'Subtitle Stream Filter',
         titleP: 'Subtitle Stream Filters',
+		iconCls: 'subtitle',
         tabIndex: 4,
         edit: { params: { list: eslist } },
         add: {
@@ -140,6 +142,7 @@ tvheadend.esfilter_tab = function(panel)
         url: 'api/esfilter/other',
         titleS: 'Other Stream Filter',
         titleP: 'Other Stream Filters',
+		iconCls: 'otherFilters',
         tabIndex: 6,
         edit: { params: { list: eslist } },
         add: {
diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index 2c41c9dc..8c987784 100644
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -346,6 +346,42 @@
     background-image: url(../icons/exclamation.png) !important;
 }
 
+.tvCards {
+    background-image: url(../icons/tv_cards.png) !important;
+}
+
+.networks {
+    background-image: url(../icons/networks.png) !important;
+}
+
+.muxes {
+    background-image: url(../icons/muxes.png) !important;
+}
+
+.muxSchedulers {
+    background-image: url(../icons/mux_schedulers.png) !important;
+}
+
+.services {
+    background-image: url(../icons/services.png) !important;
+}
+
+.teletext {
+    background-image: url(../icons/teletext.png) !important;
+}
+
+.subtitle {
+    background-image: url(../icons/subtitle.png) !important;
+}
+
+.serviceMapper {
+    background-image: url(../icons/service_mapper.png) !important;
+}
+
+.otherFilters {
+    background-image: url(../icons/other_filters.png) !important;
+}
+
 .x-linked {
     display: inline-block;
     background-image: url(../icons/linked.gif) !important;
diff --git a/src/webui/static/app/mpegts.js b/src/webui/static/app/mpegts.js
index bb5c193d..b92eb4e8 100644
--- a/src/webui/static/app/mpegts.js
+++ b/src/webui/static/app/mpegts.js
@@ -31,6 +31,7 @@ tvheadend.networks = function(panel, index)
         url: 'api/mpegts/network',
         titleS: 'Network',
         titleP: 'Networks',
+		iconCls: 'networks',
         tabIndex: index,
         help: function() {
             new tvheadend.help('Networks', 'config_networks.html');
@@ -62,6 +63,7 @@ tvheadend.muxes = function(panel, index)
         url: 'api/mpegts/mux',
         titleS: 'Mux',
         titleP: 'Muxes',
+		iconCls: 'muxes',
         tabIndex: index,
         hidemode: true,
         help: function() {
@@ -254,6 +256,7 @@ tvheadend.services = function(panel, index)
         url: 'api/mpegts/service',
         titleS: 'Service',
         titleP: 'Services',
+		iconCls: 'services',
         tabIndex: index,
         hidemode: true,
         add: false,
@@ -290,6 +293,7 @@ tvheadend.mux_sched = function(panel, index)
         url: 'api/mpegts/mux_sched',
         titleS: 'Mux Scheduler',
         titleP: 'Mux Schedulers',
+		iconCls: 'muxSchedulers',
         tabIndex: index,
         help: function() {
             new tvheadend.help('Mux Schedulers', 'config_muxsched.html');
diff --git a/src/webui/static/app/servicemapper.js b/src/webui/static/app/servicemapper.js
index 26b2857e..89e63707 100644
--- a/src/webui/static/app/servicemapper.js
+++ b/src/webui/static/app/servicemapper.js
@@ -32,6 +32,7 @@ tvheadend.service_mapper_status = function(panel, index)
     var mpanel = new Ext.FormPanel({
         method: 'get',
         title: 'Service Mapper',
+		iconCls: 'serviceMapper',
         frame: true,
         border: true,
         bodyStyle: 'padding: 5px',
diff --git a/src/webui/static/icons/mux_schedulers.png b/src/webui/static/icons/mux_schedulers.png
new file mode 100644
index 00000000..a693c8b4
Binary files /dev/null and b/src/webui/static/icons/mux_schedulers.png differ
diff --git a/src/webui/static/icons/muxes.png b/src/webui/static/icons/muxes.png
new file mode 100644
index 00000000..febe1507
Binary files /dev/null and b/src/webui/static/icons/muxes.png differ
diff --git a/src/webui/static/icons/networks.png b/src/webui/static/icons/networks.png
new file mode 100644
index 00000000..d2a77971
Binary files /dev/null and b/src/webui/static/icons/networks.png differ
diff --git a/src/webui/static/icons/other_filters.png b/src/webui/static/icons/other_filters.png
new file mode 100644
index 00000000..f54db046
Binary files /dev/null and b/src/webui/static/icons/other_filters.png differ
diff --git a/src/webui/static/icons/service_mapper.png b/src/webui/static/icons/service_mapper.png
new file mode 100644
index 00000000..45f10a41
Binary files /dev/null and b/src/webui/static/icons/service_mapper.png differ
diff --git a/src/webui/static/icons/services.png b/src/webui/static/icons/services.png
new file mode 100644
index 00000000..9bdb2760
Binary files /dev/null and b/src/webui/static/icons/services.png differ
diff --git a/src/webui/static/icons/subtitle.png b/src/webui/static/icons/subtitle.png
new file mode 100644
index 00000000..b3ff4b9f
Binary files /dev/null and b/src/webui/static/icons/subtitle.png differ
diff --git a/src/webui/static/icons/teletext.png b/src/webui/static/icons/teletext.png
new file mode 100644
index 00000000..e9642ccf
Binary files /dev/null and b/src/webui/static/icons/teletext.png differ
diff --git a/src/webui/static/icons/tv_cards.png b/src/webui/static/icons/tv_cards.png
new file mode 100644
index 00000000..76e6c2f8
Binary files /dev/null and b/src/webui/static/icons/tv_cards.png differ