[TASK] RT-2416, RT-2417 UI fixes
Merge pull request #1656 from Mesrop/develop-RT-2416-17-10

[TASK] RT-2416, RT-2417 UI fixes