Add secondary toot button + other toot button enhancements. Squashing so it's easy to revert if needed.