Fix icon cut off problem

I've tried to fix the icon cut off problem like issue #14.