Icon flip doesn't really work - dunno why.
Merge branch 'bootstrap' into model_controller_coordination