Revamped settings popover + editor icons fix. Fixes #1, Fixes #2