Manage ProjEstimate icons on local intances  refs #566
Merge remote-tracking branch 'origin/dev' into dev