Merge "Enabling themed icon feature" into sc-dev