New icons, further renaming and cleanup