Revert "Settings : Quick settings/Ribbons (Squashed commit)"

This reverts commit 06869d9108964260fbf8682950f004f132bd9f72

Conflicts:
	res/values/cm_strings.xml