Revamp buttons

**Work in progress**, not to merge for now.

To be implemented following the commentary.