btn-active fix up and icon fix up