Move the scope in icon font styles again.
(cherry picked from commit 9a96f51)