Added missing icons and made some margin changes