Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev