Merge "Updating method for getting themed icon" into sc-dev