merge with bitmask systray

Can we have one single implementation of a systray for bitmask and riseupvpn?