Updated icon
Use Callback in key, fix issue #2