theme improvements, updated icons, styled modal and bug fixes
merge