Arch: Fixed toolbar mode - fixes #1473