Clean up settings panel code, add new icons