btn-active fix up and icon fix up
Merge pull request #3 from Yaliang/master

btn-active fix up and icon fix up