Fixes #62, wherein the device toolbars behave differently than the simulator