diff --git a/src/webui/static/app/config.js b/src/webui/static/app/config.js
index 076c9beb..e9338bcf 100644
--- a/src/webui/static/app/config.js
+++ b/src/webui/static/app/config.js
@@ -216,6 +216,7 @@ tvheadend.miscconf = function(panel, index) {
 
     var helpButton = new Ext.Button({
         text: 'Help',
+		iconCls: 'help',
         handler: function() {
             new tvheadend.help('General Configuration', 'config_misc.html');
         }
diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index 3f19b300..e2e84a3d 100644
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -703,7 +703,7 @@ tvheadend.epg = function() {
 
     tvheadend.autorecButton = new Ext.Button({
         text: 'Create AutoRec',
-        iconCls: 'wand',
+        iconCls: 'autoRec',
         tooltip: 'Create an automatic recording entry that will '
                  + 'record all future programmes that matches '
                  + 'the current query.',
@@ -723,7 +723,7 @@ tvheadend.epg = function() {
         '->',
         {
             text: 'Watch TV',
-            iconCls: 'eye',
+            iconCls: 'watchTv',
             handler: function() {
                 new tvheadend.VideoPlayer();
             }
@@ -733,6 +733,7 @@ tvheadend.epg = function() {
         '-',
         {
             text: 'Help',
+			iconCls: 'help',
             handler: function() {
                 new tvheadend.help('Electronic Program Guide', 'epg.html');
             }
diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index 67d092c8..174e825f 100644
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -390,6 +390,18 @@
     background-image: url(../icons/channel_tags.png) !important;
 }
 
+.help{
+    background-image: url(../icons/help.png) !important;
+}
+
+.watchTv{
+    background-image: url(../icons/watch_tv.png) !important;
+}
+
+.autoRec{
+    background-image: url(../icons/auto_rec.png) !important;
+}
+
 .x-linked {
     display: inline-block;
     background-image: url(../icons/linked.gif) !important;
diff --git a/src/webui/static/icons/auto_rec.png b/src/webui/static/icons/auto_rec.png
new file mode 100644
index 00000000..ba7aecd8
Binary files /dev/null and b/src/webui/static/icons/auto_rec.png differ
diff --git a/src/webui/static/icons/help.png b/src/webui/static/icons/help.png
new file mode 100644
index 00000000..dc15b8da
Binary files /dev/null and b/src/webui/static/icons/help.png differ
diff --git a/src/webui/static/icons/watch_tv.png b/src/webui/static/icons/watch_tv.png
new file mode 100644
index 00000000..859cb796
Binary files /dev/null and b/src/webui/static/icons/watch_tv.png differ