Merge "Unifying icon loading methods" into sc-dev