Create new "settings" icon, move "settings" icon to "advanced"

Advanced is now the gear, and settings is a set of sliding controls.

Change-Id: I0aa62df662b815afd8943e9305d22004d527b4ec