Adding better icons, these still neneed some work though