Added icons and image buttons