Entries toolbar fixes.