Revert "Merge pull request #26189 from albertopq/1074332-icons-toggle"

This reverts commit 8654a14cd4a790484603fded2566367eca6cbeb6, reversing
changes made to efeabc1b3435eeea619734051f144a521cf483f8.