Refactoring + Support for HOME_COUNTRY_SHORT and WARNING_ICON environment variables