BS223: Facelift

* changed icon classes

Change-Id: Ie37c6accd35642c057ec355a62377dfd50323a86
Merge "BS223: Facelift"