Reverse c1c81b

Reverse commit c1c81b.

Fix for #5064 until I can think of a better solution for allowing developers to use the menu-icon outside of the topbar or the tabbar.