diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index e2e84a3d..eddb8c82 100644
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -724,6 +724,7 @@ tvheadend.epg = function() {
         {
             text: 'Watch TV',
             iconCls: 'watchTv',
+			tooltip: 'Watch TV online in the window by web',
             handler: function() {
                 new tvheadend.VideoPlayer();
             }
diff --git a/src/webui/static/app/epggrab.js b/src/webui/static/app/epggrab.js
index 7720891c..268332ac 100644
--- a/src/webui/static/app/epggrab.js
+++ b/src/webui/static/app/epggrab.js
@@ -298,6 +298,7 @@ tvheadend.epggrab = function(panel, index) {
 
     var helpButton = new Ext.Button({
         text: 'Help',
+		iconCls: 'help',
         handler: function() {
             new tvheadend.help('EPG Grab Configuration', 'config_epggrab.html');
         }
diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index 174e825f..3c431a38 100644
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -402,6 +402,10 @@
     background-image: url(../icons/auto_rec.png) !important;
 }
 
+.debug{
+    background-image: url(../icons/debug.png) !important;
+}
+
 .x-linked {
     display: inline-block;
     background-image: url(../icons/linked.gif) !important;
diff --git a/src/webui/static/app/timeshift.js b/src/webui/static/app/timeshift.js
index 8653b330..b7085125 100644
--- a/src/webui/static/app/timeshift.js
+++ b/src/webui/static/app/timeshift.js
@@ -90,6 +90,7 @@ tvheadend.timeshift = function(panel, index) {
 
     var helpButton = new Ext.Button({
         text: 'Help',
+		iconCls: 'help',
         handler: function() {
             new tvheadend.help('Timeshift Configuration', 'config_timeshift.html');
         }
diff --git a/src/webui/static/app/tvhlog.js b/src/webui/static/app/tvhlog.js
index 665cd710..36cbeb16 100644
--- a/src/webui/static/app/tvhlog.js
+++ b/src/webui/static/app/tvhlog.js
@@ -55,6 +55,7 @@ tvheadend.tvhlog = function(panel, index) {
 
     var helpButton = new Ext.Button({
         text: 'Help',
+		iconCls: 'help',
         handler: function() {
             new tvheadend.help('Debug Configuration', 'config_tvhlog.html');
         }
@@ -72,7 +73,7 @@ tvheadend.tvhlog = function(panel, index) {
 
     var confpanel = new Ext.form.FormPanel({
         title: 'Debugging',
-        iconCls: 'wrench',
+        iconCls: 'debug',
         border: false,
         bodyStyle: 'padding:15px',
         labelAlign: 'left',
diff --git a/src/webui/static/icons/debug.png b/src/webui/static/icons/debug.png
new file mode 100644
index 00000000..39a2e827
Binary files /dev/null and b/src/webui/static/icons/debug.png differ