Fixes #3287, better journal icons

This seems to have gotten some of the upstream changes added :-1: 
This requires my changes to the toolkit...