Move the scope in icon font styles again.
(cherry picked from commit 15219f4)