 			data: @__selectedMarkerOptions
 			name: "iconName"
 			onDataChanged: =>
-				@__map.updateSelectedMarkerOptions(@__selectedMarkerOptions)
+				@__onIconChanged()
 				if not CUI.util.isNull(@__selectedMarkerOptions.iconName)
 					iconColorSelect.enable()
 				else

			name: "iconColor"
			disabled: CUI.util.isNull(@__selectedMarkerOptions.iconName)
			onDataChanged: =>
				@__map.updateSelectedMarkerOptions(@__selectedMarkerOptions)
			options: =>
				options = []
				for color in CUI.MapInput.defaults.iconColors

		popoverTemplate.append(@__map, "center")
		popoverTemplate

	__onIconChanged: ->
		@__map.updateSelectedMarkerOptions(@__selectedMarkerOptions)
		@__data.iconName = @__selectedMarkerOptions.iconName
		@__data.iconColor = @__selectedMarkerOptions.iconColor

	__initMap: ->
		@_mapOptions.onMarkerSelected = (marker) =>
			formattedPosition = @__getFormattedPosition(
