More bs3 updates for icons and some helper merging.