WPBQA-291: adjust icon size and add margin for border.