Nav drawer icons, code improvement