FLUID-4961: Added a style override for the font-icon so they are not replaced by a new font when the style is switched in the UIO panel.
Merge branch 'demo' into FLUID-4961
FLUID-4961: merging with demo code.
Merge remote-tracking branch 'jhung/FLUID-4961' into demo

* jhung/FLUID-4961:
  FLUID-4961: Added a style override for the font-icon so they are not replaced by a new font when the style is switched in the UIO panel.