Remove over engineered icon implementation