Some refactoring
Adjust settings dialog
Add icons on menu
Fix link from menu