Icons, folder change, small design tweaks

Icons, folder change, small design tweaks