Remove unneeded collates from schema
Merge branch 'develop' into feature/front-end-rewrite
Fixed missing icons for removing sides