Merge "Removing some dependency on icon shape" into sc-dev