Move the scope in icon font styles.
(cherry picked from commit 8da83d5)