Adding icons
clean up icons
minor padding change