Fixes flashing buttons
Merge branch 'fix/buttons' into develop

* fix/buttons:
  Fixes flashing buttons