Merge "Replace tab texts with icons"