Remove LPDI drawables
Clean up styles
Merge branch 'develop' into feature/reports