revert switch to generic current as it cannot work as icons differents for various themes and also create build cycle