Correcting sub-theme issue with top icon
Correcting issue with sub-theme icon
Merge branch 'master' into live