Attempt to fix missing icon text in menu dialog
Fixed Lint warnings and removed unused files