Merge "Updated misc. settings icon" into pi-dev
am: c3d2e78d82

Change-Id: Ie61946bfa07c093748a5c4553988d6f1f87c1ef3