Refactor Markers, change category icons
merge