Fix for issue ##249  Update Keyhotee Icon  and some cleaup