Fixes #3287, Better journal icons

You also need my tool kit changes