button in settings
Revert "button in settings"

This reverts commit 7b1cffde5e42c5e3d72ebbf875910e5b358a3d9c.
Merge remote-tracking branch 'origin/master'