Merge "Remove color font and icons overlays" into sc-dev