Revert "Circle buttons"

This reverts commit a229786ea5a1171ab9864cb132af84d99683b674.