Revert "Merge from origin/dev"

This reverts commit ea58021efff832a35028fd7f6ca60aec91ba7b87, reversing
changes made to 1d83f592e2753468a262a5be1e140385b9b27b31.

Trying to reobtain Button