1 files changed, 12 insertions, 6 deletions
diff --git a/plugins/Watrack/i_gui.inc b/plugins/Watrack/i_gui.inc
index 2ed5411bed..ad697d6fa5 100644
--- a/plugins/Watrack/i_gui.inc
+++ b/plugins/Watrack/i_gui.inc
@@ -25,7 +25,7 @@ begin
     ttbState:=0
   else
     CallService(MS_TTB_SETBUTTONOPTIONS,(ttbState shl 16)+TTBO_TIPNAME,
-        tlparam(Translate('Disable Plugin')));
+        tlparam(Translate('Disable WATrack')));
   result:=0;
 end;
 
@@ -38,7 +38,7 @@ begin
   mi.szPopupName.a:=PluginShort;
 
   mi.hIcon        :=CallService(MS_SKIN2_GETICON,0,lparam(IcoBtnEnable));
-  mi.szName.a     :='Disable Plugin';
+  mi.szName.a     :='Disable WATrack';
   mi.pszService   :=MS_WAT_PLUGINSTATUS;
   mi.popupPosition:=MenuDisablePos;
   hMenuDisable:=Menu_AddMainMenuItem(@mi);
@@ -55,12 +55,12 @@ begin
   if f1<>0 then
   begin
     mi.hIcon   :=CallService(MS_SKIN2_GETICON,0,lparam(IcoBtnDisable));
-    mi.szName.a:='Enable Plugin';
+    mi.szName.a:='Enable WATrack';
   end
   else
   begin
     mi.hIcon   :=CallService(MS_SKIN2_GETICON,0,lparam(IcoBtnEnable));
-    mi.szName.a:='Disable Plugin';
+    mi.szName.a:='Disable WATrack';
   end;
   CallService(MS_CLIST_MODIFYMENUITEM,hMenuDisable,lparam(@mi));
 
@@ -68,12 +68,12 @@ begin
   begin
     if f1<>0 then
     begin
-      p:='Enable Plugin';
+      p:='Enable WATrack';
       CallService(MS_TTB_SETBUTTONSTATE,ttbState,TTBST_RELEASED)
     end
     else
     begin
-      p:='Disable Plugin';
+      p:='Disable WATrack';
       CallService(MS_TTB_SETBUTTONSTATE,ttbState,TTBST_PUSHED);
     end;
     CallService(MS_TTB_SETBUTTONOPTIONS,(ttbState shl 16)+TTBO_TIPNAME,
@@ -97,6 +97,12 @@ begin
 // toptoolbar
   if ServiceExists(MS_TTB_GETBUTTONOPTIONS)<>0 then
   begin
+{
+    CallService(MS_TTB_GETBUTTONOPTIONS,(ttbInfo shl 16)+TTBO_ALLDATA,tlparam(@ttb));
+    ttb.hIconUp:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnInfo));
+    ttb.hIconDn:=ttb.hIconUp;
+    CallService(MS_TTB_SETBUTTONOPTIONS,(ttbInfo shl 16)+TTBO_ALLDATA,tlparam(@ttb));
+}
     CallService(MS_TTB_GETBUTTONOPTIONS,(ttbState shl 16)+TTBO_ALLDATA,tlparam(@ttb));
     ttb.hIconDn:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnEnable));
     ttb.hIconUp:=CallService(MS_SKIN2_GETICON,0,tlparam(IcoBtnDisable));