added icons with borders and fixed margin issue of figures