Fixes for API rev. < 11 and better icons and graphics