[QE-407] Improved top right UI button