Bugfix/v3.17.x.x/minimizing and closing invisible with popup (#182)

* Update UI - Minimize and Close all the time visible

* Update changelog and version

* Refactoring

Co-authored-by: Jakub Szczyrk <Jakub Szczyrk>

Author: Szczyrk