Categorize Oct settings and move battery icon

into statusbar settings menu
Stay in line with aosp menu style

...removed icob for theme manager menu item