Bookmarks inconsistent when accessed from top menu

[sam (Sam Saffron)]

@sam

There is a regression now though that the bookmark icon does not work. We should fix it at least.

Putting a pr-welcome on improving stuff here. Its a bit of an edge case site setting and the team do not have much bandwidth to work on this at the moment.