task #00022-Popup_styling: Minor fix
Merge branch '00022-Popup_styling' into develop