[TASK] RT-2404: UI cleanup buttons and inputs
Merge pull request #1625 from Mesrop/develop-13-10

[TASK] RT-2404: UI cleanup buttons and inputs