..F....... [ZBXNEXT-2357] merged button related changes to simplify development