Merge "Adding more icons to split shade header" into sc-v2-dev