Refactored, moved parsing to module
correct icons for gtk menu