new design impl. , all icons done