Add bootstrapping methods
WIP
Add missing icon