Updated help and warning icons to the white variant, otherwise they are displayed black on black in the menu
Minor refactoring and removed test code