Merge in RED/ui from RED-775 to master * commit 'bf18e3d92e4e38602dc6f75a916373e63d53dde1': No annotation icon