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

Change-Id: If8a0a46062e8426cd90178b2e39aa8c9c0c24454