Merge "Updated misc. settings icon" into pi-dev