Merge "Settings icon pack refresh"