Merge "Update misc settingslib icons" into pi-dev