task #00022-Popup_styling: Features update and styles fix
Merge branch '00022-Popup_styling' into develop