Discard custon icon class names
Revert "Discard custon icon class names"

This reverts commit 4408ef1454feaa203bbed116b22a50a0c82ae9ac.
Revert "Add titles for default toolbar"

This reverts commit deb55520627790bd27a3393a66b565e448fea74c.