Fixed issue #15 and added new icons