case 2784 - Better implementation of action buttons.
Merge branch 'case-2784' into new-search

* case-2784:
  case 2784 - Better implementation of action buttons.