fixed mouse pointer
Merge remote-tracking branch 'origin/wes' into tal
testing the icon functionality
Merge remote-tracking branch 'origin/tal' into wes