Display extra help button in edit mode only
Keep non font-awesome behaviour for other interfaces using widgets
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x