It is not lining up with the icon on x axis. Forcing Button2 seemed to fix it initially but fails now????. I issue appears around line #517
if (A_OSVersion>"5" && A_OSVersion<"10")
ControlGetPos,xc,yc,xw,yw,Button1,ahk_id %hWndTray%
else
ControlGetPos,xc,yc,xw,yw,Button2,ahk_id %hWndTray%