submodules
submodules
Merge remote-tracking branch 'origin/master'
Refs #4510 Revert as it's causing visual bugs (some widget content now overflowing)
Rename annotations icons + adding two missing icons refs #4457