More specific referencing to icons-fffff. Closes #558
Take the max-width approach on modal size
Merge branch 'master' into v1.5.0