Merge "Allow more flexibility for icon selection" into pi-dev