Fix icons
Merge remote-tracking branch 'origin/feature-mm-update_bootstrap' into feature-ag-preparing