diff --git a/config/HelpMenu.xml b/config/HelpMenu.xml
index 226e29086..e8c1e9bac 100644
--- a/config/HelpMenu.xml
+++ b/config/HelpMenu.xml
@@ -191,11 +191,10 @@
 			</paragraph>
 			<paragraph>
 				<text text="$l10n_CP_help_page_customFieldDone_text"/>
-				<image filename="img/helpmenu/donecustomhelp.dds" size="1024 1024" uvs="0px 0px 765px 510px" aspectRatio="0.66"/>
 			</paragraph>	
 			<paragraph>	
 				<text text="$l10n_CP_help_page_customFieldDraw_text"/>
-				<image filename="img/helpmenu/drawcustomhelp.dds" size="1024 1024" uvs="0px 0px 765px 510px" aspectRatio="0.66"/>
+				<image filename="img/helpmenu/customfield.dds" size="1024 1024" uvs="0px 0px 765px 510px" aspectRatio="0.66"/>
             </paragraph>
 		</page>
 		<!--Courseplay Multitool and Convoy-->
diff --git a/config/MasterTranslations.xml b/config/MasterTranslations.xml
index 0e30805f2..aa0922ec8 100644
--- a/config/MasterTranslations.xml
+++ b/config/MasterTranslations.xml
@@ -1814,6 +1814,10 @@ The course is saved automatically on closing of the editor and overrides the sel
 			<Text language="de"><![CDATA[Randkurs]]></Text>
 			<Text language="en"><![CDATA[Custom field]]></Text>
 		</Translation>
+		<Translation name="CP_customFieldManager_fieldList">
+			<Text language="de"><![CDATA[Randkurse]]></Text>
+			<Text language="en"><![CDATA[Custom fields]]></Text>
+		</Translation>
 		<Translation name="CP_customFieldManager_confirm_save">
 			<Text language="de"><![CDATA[Möchtest du diesen benutzerdefinierten Randkurs als %s speichern?]]></Text>
 			<Text language="en"><![CDATA[Do you want to save the recorded course as custom field %s?]]></Text>
@@ -2462,19 +2466,24 @@ By clicking on the name you will get the option to either delete, rename or edit
 		</Translation>
 		<Translation name="CP_help_page_customFieldDraw_text">
 			<Text language="de"><![CDATA[
-Die zweite Option ist das Zeichnen im Helfermenü.
-Dazu darfst du kein Fahrzeug ausgewählt haben (Linksklick irgendwo auf der Karte) und du bekommst die Option, einen Randkurs zu zeichnen.
-Wenn du das Zeichnen gestartet hast, wird der Text "Zeichne einen Randkurs" angezeigt.
+Die zweite Option ist das Zeichnen im CP Helfermenü.
+Start der Aufzeichnung geht mit dem Button unten links oder der entsprechenden Taste.
+Wenn du das Zeichnen gestartet hast, wird der Text 'Zeichne einen Randkurs' angezeigt.
 Mit der rechten Maustaste kannst du jetzt den ersten Punkt setzen.
+Mit der shift-Taste lässt sich die Linie im 90° Winkel gehalten.
 Mit einem weiteren Rechtsklick wird eine Linie von deinem ersten zum zweiten Punkt gezogen, der zweite Punkt ist nun wieder der Startpunkt für die nächste Linie.
+Nach der zweiten Linie wird der Randkurs automatisch geschlossen. Du kannst trotzdem weitere Linien hinzufügen um das Feld genauer zu definieren.
+Es wird keine letzte Linie zum Startpunkt benötigt, da diese automatisch direkt zum start erzeugt wird.
 ]]></Text>
 			<Text language="en"><![CDATA[
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 ]]></Text>
 		</Translation>
 		<Translation name="CP_help_page_multiConvoy_title">
diff --git a/config/gui/pages/CourseGeneratorFrame.xml b/config/gui/pages/CourseGeneratorFrame.xml
index da191c2f0..f1b1f7d0f 100644
--- a/config/gui/pages/CourseGeneratorFrame.xml
+++ b/config/gui/pages/CourseGeneratorFrame.xml
@@ -34,6 +34,7 @@
                         <RoundCorner profile="fs25_subCategorySelectorDot" />
                         <RoundCorner profile="fs25_subCategorySelectorDot" />
                         <RoundCorner profile="fs25_subCategorySelectorDot" />
+                        <RoundCorner profile="fs25_subCategorySelectorDot" />
                     </BoxLayout>
                     <GuiElement profile="fs25_subCategoryListContainer" id="filterListContainer">
                         <SmoothList profile="fs25_mapList" id="filterList" focusInit="onOpen"
@@ -138,6 +139,34 @@
                             <Slider profile="fs25_listSlider" dataElementId="activeWorkerList" />
                         </ThreePartBitmap>
                     </GuiElement>
+                    <GuiElement profile="fs25_subCategoryListContainer" id="customFieldListContainer">
+                        <SmoothList profile="fs25_mapList" id="customFieldList" focusInit="onOpen"
+                            listSectionHeader="section" startClipperElementName="startClipper"
+                            endClipperElementName="endClipper" onClick="onClickList">
+                            <ListItem profile="fs25_mapListItem">
+                                <Bitmap profile="fs25_mapListItemIconBg" name="iconBg" />
+                                <Bitmap profile="fs25_mapListColorTemplate" name="colorTemplate" />
+                                <Bitmap profile="fs25_mapListItemIcon" name="icon" />
+                                <Text profile="fs25_mapListItemName" name="name" />
+                            </ListItem>
+                            <ListItem profile="fs25_subCategoryListSectionHeader" name="section">
+                                <Text profile="fs25_subCategoryListSectionHeaderTitle" name="title" />
+                            </ListItem>
+                        </SmoothList>
+                        <Bitmap profile="fs25_subCategoryStartClipper" name="startClipper" />
+                        <Bitmap profile="fs25_subCategoryStopClipper" position="0px 60px" name="endClipper" />
+                        <ThreePartBitmap profile="fs25_subCategoryListSliderBox" absoluteSizeOffset="0px 60px">
+                            <Slider profile="fs25_listSlider" dataElementId="customFieldList" />
+                        </ThreePartBitmap>
+                        <GuiElement profile="fs25_mapButtonContainer" id="buttonDrawCustomField"
+                            width="340px" position="-10px 0px">
+                            <ThreePartBitmap profile="fs25_mapButtonBgLight" />
+                            <Text profile="fs25_mapButtonText" name="text"
+                                text="$l10n_CP_customFieldManager_draw" textOffset="15px 0px" />
+                            <Button profile="fs25_mapButtonAction1" name="button"
+                                onClick="onClickDrawCustomField" />
+                        </GuiElement>
+                    </GuiElement>
                 </Bitmap>
             </GuiElement>
             <GuiElement profile="cpMenuContainer">
@@ -159,6 +188,10 @@
                     <Text profile="fs25_shopBalance" text="$l10n_ui_balance:" />
                     <Text profile="fs25_shopMoney" id="currentBalanceText" />
                 </BoxLayout> -->
+                <GuiElement id="customFieldStatusMessage">
+                    <Text profile="cpAIStatusText" text="$l10n_CP_customFieldManager_draw_header"/>
+                    <Text profile="cpAIStatusText" text="$l10n_CP_customFieldManager_draw_sub_header" position="-300px -30px" />
+                </GuiElement>
                 <Text profile="cpAIStatusText" id="statusMessage" />
             </GuiElement>
             <GuiElement profile="fs25_mapContextBoxContainer" newLayer="true">
diff --git a/img/helpmenu/customfield.dds b/img/helpmenu/customfield.dds
new file mode 100644
index 000000000..51521ddc8
Binary files /dev/null and b/img/helpmenu/customfield.dds differ
diff --git a/scripts/field/CustomField.lua b/scripts/field/CustomField.lua
index 271d3dd1e..cbdb4d8f7 100644
--- a/scripts/field/CustomField.lua
+++ b/scripts/field/CustomField.lua
@@ -54,6 +54,11 @@ function CustomField:setVertices(vertices)
     self.vertices = vertices
 end
 
+---@return CustomFieldHotspot
+function CustomField:getHotspot()
+    return self.fieldHotspot
+end
+
 function CustomField:delete()
     if self.fieldHotspot then
         g_currentMission:removeMapHotspot(self.fieldHotspot)
diff --git a/scripts/field/CustomFieldManager.lua b/scripts/field/CustomFieldManager.lua
index 051a8de5f..e7029835f 100644
--- a/scripts/field/CustomFieldManager.lua
+++ b/scripts/field/CustomFieldManager.lua
@@ -37,6 +37,17 @@ function CustomFieldManager:init(fileSystem)
     self:load()
 end
 
+---@return number
+function CustomFieldManager:getNumFields()
+    return #self.fields
+end
+
+---@param index number
+---@return CustomField|nil
+function CustomFieldManager:getFieldByIndex(index)
+    return self.fields[index]
+end
+
 function CustomFieldManager:load()
     self.fields = {}
     self.fileSystem:refresh()
@@ -71,6 +82,17 @@ function CustomFieldManager:getNewFieldNumber()
     return ix
 end
 
+---@param polygon Polygon
+function CustomFieldManager:addFieldFromPolygon(polygon)
+    local waypoints = {}
+    polygon:calculateProperties()
+    polygon:splitEdges(5)
+	for _, v in polygon:vertices() do
+		table.insert(waypoints, Waypoint.initFromGeneratedWp(v))
+	end
+    self:addField(waypoints)
+end
+
 --- Creates a new custom field from a given vertices table.
 ---@param waypoints table
 function CustomFieldManager:addField(waypoints)
@@ -147,6 +169,7 @@ function CustomFieldManager:onClickSaveDialog(clickOk, field)
             fieldValid = true
             table.insert(self.fields, field)
             self.fileSystem:refresh()
+            g_messageCenter:publish(MessageType.CP_CUSTOM_FIELD_CHANGED)
         else 
             CpUtil.info("Failed to create custom Field: %s", field:getName())
         end
@@ -255,5 +278,6 @@ end
 
 -- for reload only:
 if g_customFieldManager then
+    ---@type CustomFieldManager
     g_customFieldManager = CustomFieldManager(FileSystem(g_Courseplay.customFieldDir, g_currentMission.missionInfo.mapId))
 end
\ No newline at end of file
diff --git a/scripts/geometry/Polygon.lua b/scripts/geometry/Polygon.lua
index b943b33c1..21629a0cb 100644
--- a/scripts/geometry/Polygon.lua
+++ b/scripts/geometry/Polygon.lua
@@ -59,9 +59,9 @@ end
 --- (  3, nil) -> 3, 4, 5, 1, 2
 --- (  3,   1) -> 3, 4, 5, 1
 --- (  1,   3) -> 1, 2, 3
----@param from number index of first vertex
----@param to number index of last vertex
----@param step number step (1 or -1 only), direction of iteration
+---@param from number|nil index of first vertex
+---@param to number|nil index of last vertex
+---@param step number|nil step (1 or -1 only), direction of iteration
 ---@return number, Vertex, Vertex, Vertex the index, the vertex at index, the previous, and the next vertex.
 --- previous and next may be nil
 function Polygon:vertices(from, to, step)
diff --git a/scripts/geometry/Polyline.lua b/scripts/geometry/Polyline.lua
index 0292892d5..4b4e570b0 100644
--- a/scripts/geometry/Polyline.lua
+++ b/scripts/geometry/Polyline.lua
@@ -818,7 +818,7 @@ function Polyline:setAttribute(ix, setter, ...)
 end
 
 --- Remove all existing vertices
----@param ix number optional start index
+---@param ix number|nil optional start index
 function Polyline:_reset(ix)
     for i = ix or 1, #self do
         self[i] = nil
diff --git a/scripts/gui/CustomFieldHotspot.lua b/scripts/gui/CustomFieldHotspot.lua
index 7aee8537b..efa8dccd3 100644
--- a/scripts/gui/CustomFieldHotspot.lua
+++ b/scripts/gui/CustomFieldHotspot.lua
@@ -1,4 +1,5 @@
 --- Custom field hotspot that can be clicked for deleting of the field course.
+---@class CustomFieldHotspot
 CustomFieldHotspot = {}
 CustomFieldHotspot.CATEGORY = 200
 CustomFieldHotspot.SLICE_ID = "gui.ingameMap_other"
diff --git a/scripts/gui/pages/CpCourseGeneratorFrame.lua b/scripts/gui/pages/CpCourseGeneratorFrame.lua
index c76814fad..44dde24d5 100644
--- a/scripts/gui/pages/CpCourseGeneratorFrame.lua
+++ b/scripts/gui/pages/CpCourseGeneratorFrame.lua
@@ -2,7 +2,8 @@
 	This frame is a page for all global settings in the in game menu.
 	All the layout, gui elements are cloned from the general settings page of the in game menu.
 ]]--
-
+---@class CpCourseGeneratorFrame
+---@field drawFieldBorderPolygon Polygon
 CpCourseGeneratorFrame = {
 	CATEGRORIES = {
 		IN_GAME_MAP = 1,
@@ -39,17 +40,21 @@ CpCourseGeneratorFrame = {
 		GENERATE_COURSE = 5,
 		DELETE_CUSTOM_FIELD = 6,
 		RENAME_CUSTOM_FIELD = 7,
-		EDIT_CUSTOM_FIELD 	= 8
+		EDIT_CUSTOM_FIELD 	= 8,
+		DRAW_CUSTOM_FIELD 	= 9,
+		HOTSPOT_SELECT_ALL	= 10
 	},
 	AI_MODE_OVERVIEW = 1,
 	AI_MODE_CREATE = 2,
 	AI_MODE_WORKER_LIST = 3,
+	AI_MODE_DRAW_CUSTOM_FIELD = 4,
 	MAP_SELECTOR_HOTSPOT = 1,
 	MAP_SELECTOR_CREATE_JOB = 2,
 	MAP_SELECTOR_ACTIVE_JOBS = 3,
+	MAP_SELECTOR_CUSTOM_FIELDS = 4,
 	CP_MAP_HOTSPOT_OFFSET = 200,
-	BASE_XML_KEY = "CourseGenerator"
-
+	BASE_XML_KEY = "CourseGenerator",
+	DRAW_DELAY = 1
 	-- POSITION_UVS = GuiUtils.getUVs({
 	-- 	760,
 	-- 	4,
@@ -110,10 +115,15 @@ function CpCourseGeneratorFrame.new(target, custom_mt)
 	self.mapSelectorTexts = {
 		g_i18n:getText("ui_mapOverviewHotspots"),
 		g_i18n:getText("button_createJob"),
-		g_i18n:getText("ui_activeAIJobs")}
+		g_i18n:getText("ui_activeAIJobs"),
+		g_i18n:getText("CP_customFieldManager_fieldList")}
 
 	--- Bitmask for the visible cp hotspots.
 	self.cpHotspotSettingValue = 1
+	--- Draws the current progress, while creating a custom field.
+	self.customFieldPlot = FieldPlot(true)
+	self.drawFieldBorderPolygon = Polygon()
+	self.drawDelay = 0
 	return self
 end
 
@@ -162,16 +172,6 @@ function CpCourseGeneratorFrame:initialize(menu)
 	self.onClickBackCallback = menu.clickBackCallback
 	self:initializeContextActions()
 
-	self.generateCourseMenuButton = {
-		["inputAction"] = InputAction.MENU_EXTRA_1,
-		["text"] = g_i18n:getText("button_blocklist"),
-		["callback"] = function()
-			-- upvalues: (copy) p_u_39
-			p_u_39:onButtonUnBan()
-		end
-	}
-
-
 	self.booleanPrefab:unlinkElement()
 	FocusManager:removeElement(self.booleanPrefab)
 	self.multiTextPrefab:unlinkElement()
@@ -356,6 +356,7 @@ function CpCourseGeneratorFrame:onFrameOpen()
 		if self.currentHotspot and self.currentHotspot:isa(CustomFieldHotspot) then 
 			self:setMapSelectionItem(self.currentHotspot)
 		end
+		self.customFieldList:reloadData()
 		self.infoTextList:reloadData()
 	end, self)
 	-- g_messageCenter:subscribe(MessageType.AI_TASK_SKIPPED, self.onAITaskSkipped, self)
@@ -400,6 +401,7 @@ function CpCourseGeneratorFrame:onFrameOpen()
 	end
 	self.activeWorkerList:reloadData()
 	self.filterList:reloadData()
+	self.customFieldList:reloadData()
 	if g_Courseplay.globalSettings.infoTextHudActive:getValue() > 0 then 
 		self.infoTextList:reloadData()
 		self.infoTextHud:setVisible(true)
@@ -415,6 +417,8 @@ function CpCourseGeneratorFrame:onFrameOpen()
 	self:setJobMenuVisible(false)
 	self.startJobPending = false
 	self.ingameMap:onOpen()
+	self.customFieldStatusMessage:setVisible(false)
+	self.statusMessage:setVisible(true)
 
 	self:updateSubCategoryPages(self.CATEGRORIES.IN_GAME_MAP)
 
@@ -489,6 +493,11 @@ function CpCourseGeneratorFrame:onFrameClose()
 end
 
 function CpCourseGeneratorFrame:onClickBack(force)
+	if self.mode == self.AI_MODE_DRAW_CUSTOM_FIELD then 
+		self.drawFieldBorderPolygon:_reset()
+		self:onClickDrawCustomField()
+		return false
+	end	
 	if self.startJobPending and not force then
 		return false
 	end
@@ -663,35 +672,32 @@ function CpCourseGeneratorFrame:onDrawPostIngameMap(element, ingameMap)
 		self.currentJob:draw(ingameMap, self.mode == self.MODE_OVERVIEW)
 	end
 
-	--- Draws the current progress, while creating a custom field.
-	-- if pageAI.mode == CpInGameMenuAIFrameExtended.MODE_DRAW_FIELD_BORDER and next(CpInGameMenuAIFrameExtended.curDrawPositions) then
-	-- 	local localX, localY = pageAI.ingameMap:getLocalPosition(g_inputBinding.mousePosXLast, g_inputBinding.mousePosYLast)
-	-- 	local worldX, worldZ = pageAI.ingameMap:localToWorldPos(localX, localY)
-
-	-- 	if #CpInGameMenuAIFrameExtended.curDrawPositions > 0 then
-	-- 		local pos = CpInGameMenuAIFrameExtended.curDrawPositions[#CpInGameMenuAIFrameExtended.curDrawPositions]
-	-- 		local dx, dz, length = CpMathUtil.getPointDirection( pos, {x = worldX, z = worldZ})
-	-- 		if Input.isKeyPressed(Input.KEY_lshift) then
-	-- 			if math.abs(dx) > math.abs(dz) then 
-	-- 				dz = 0
-	-- 				dx = math.sign(dx)
-	-- 			else
-	-- 				dx = 0
-	-- 				dz = math.sign(dz)
-	-- 			end
-	-- 			worldX = pos.x + dx * length
-	-- 			worldZ = pos.z + dz * length
-	-- 		end
-	-- 		pageAI.customFieldPlot:setNextTargetPoint(worldX, worldZ)
-	-- 	else 
-	-- 		pageAI.customFieldPlot:setNextTargetPoint()
-	-- 	end
-
-
-	-- 	pageAI.customFieldPlot:setWaypoints(CpInGameMenuAIFrameExtended.curDrawPositions)
-	-- 	pageAI.customFieldPlot:draw(self,true)
-	-- 	pageAI.customFieldPlot:setVisible(true)
-	-- end
+	-- Draws the current progress, while creating a custom field.
+	if self.mode == self.AI_MODE_DRAW_CUSTOM_FIELD and #self.drawFieldBorderPolygon > 0 then
+		local localX, localY = self.ingameMap:getLocalPosition(g_inputBinding.mousePosXLast, g_inputBinding.mousePosYLast)
+		local worldX, worldZ = self.ingameMap:localToWorldPos(localX, localY)
+		if Input.isKeyPressed(Input.KEY_lshift) then
+			---@type Vector
+			local curVector = Vector(worldX, -worldZ)
+			---@type Vertex
+			local lastVertex = self.drawFieldBorderPolygon[#self.drawFieldBorderPolygon]
+			---@type Vector
+			local dirVec = (curVector - lastVertex)
+			local length = dirVec:length()
+			dirVec = dirVec:norm()
+			if math.abs(dirVec.x) > math.abs(dirVec.y) then
+				dirVec:set(math.sign(dirVec.x), 0) 
+			else
+				dirVec:set(0, math.sign(dirVec.y)) 
+			end
+			lastVertex = lastVertex + (dirVec * length)
+			worldX = lastVertex.x
+			worldZ = -lastVertex.y
+		end
+		self.customFieldPlot:setNextTargetPoint(worldX, worldZ)
+		self.customFieldPlot:draw(ingameMap, true)
+		self.customFieldPlot:setVisible(true)
+	end
 
 end
 
@@ -705,6 +711,9 @@ function CpCourseGeneratorFrame:onClickMap(element ,worldX, worldZ)
 		self:executePickingCallback(true, angle)
 		return
 	end
+	if self.mode == self.AI_MODE_DRAW_CUSTOM_FIELD then 
+		return
+	end
 	self:setMapSelectionItem(nil)
 end
 
@@ -718,16 +727,20 @@ function CpCourseGeneratorFrame:onClickHotspot(element, hotspot)
 		self:executePickingCallback(true, math.atan2(hotspot.worldX - self.pickingRotationOrigin[0], hotspot.worldZ - self.pickingRotationOrigin[1]))
 		return
 	end
+	if self.mode == self.AI_MODE_DRAW_CUSTOM_FIELD then 
+		return
+	end
 	self:setMapSelectionItem(hotspot)
 end
 
-function CpCourseGeneratorFrame:showMapHotspot(self, hotspot) 
+function CpCourseGeneratorFrame:showMapHotspot(hotspot) 
 	self:onClickHotspot(nil, hotspot)
 	self.ingameMap:panToHotspot(hotspot)
 end
 
 function CpCourseGeneratorFrame:onClickMapOverviewSelector(state)
 	self.filterListContainer:setVisible(false)
+	self.customFieldListContainer:setVisible(false)
 	self.createJobContainer:setVisible(false)
 	self.workerListContainer:setVisible(false)
 	for i = 1, #self.mapSelectorTexts do
@@ -738,10 +751,12 @@ function CpCourseGeneratorFrame:onClickMapOverviewSelector(state)
 		self.filterListContainer:setVisible(true)
 	elseif state == self.MAP_SELECTOR_CREATE_JOB then
 		self.createJobContainer:setVisible(true)
-		-- self.subCategoryDotBox:invalidateLayout()
 	elseif state == self.MAP_SELECTOR_ACTIVE_JOBS then
 		self.workerListContainer:setVisible(true)
+	elseif state == self.MAP_SELECTOR_CUSTOM_FIELDS then
+		self.customFieldListContainer:setVisible(true)
 	end
+	self:updateContextActions()
 end
 
 function CpCourseGeneratorFrame:onClickDeselectAll()
@@ -762,6 +777,22 @@ function CpCourseGeneratorFrame:onClickDeselectAll()
 	self.filterList:reloadData()
 end
 
+function CpCourseGeneratorFrame:onClickDrawCustomField()
+	if self.mode == self.AI_MODE_DRAW_CUSTOM_FIELD then
+		g_customFieldManager:addFieldFromPolygon(self.drawFieldBorderPolygon)
+		self.mapOverviewSelector:setDisabled(false)
+		self.customFieldStatusMessage:setVisible(false)
+		self.statusMessage:setVisible(true)
+		self.mode = self.AI_MODE_OVERVIEW
+		return
+	end
+	self.drawFieldBorderPolygon:_reset()
+	self.mapOverviewSelector:setDisabled(true)
+	self.customFieldStatusMessage:setVisible(true)
+	self.statusMessage:setVisible(false)
+	self.mode = self.AI_MODE_DRAW_CUSTOM_FIELD
+end
+
 function CpCourseGeneratorFrame:onJobTypeChanged(index)
 	local jobTypeIndex = self.currentJobTypes[index]
 	self:setActiveJobTypeSelection(jobTypeIndex)
@@ -1088,10 +1119,13 @@ function CpCourseGeneratorFrame:getNumberOfItemsInSection(list, section)
 	if list == self.filterList then 
 		return #self.hotspotFilterCategories[section]
 	end
+	if list == self.customFieldList then 
+		return g_customFieldManager:getNumFields()
+	end
 	if list == self.contextButtonList then 
 		self.contextActionMapping = {}
 		for index, action in pairs(self.contextActions) do 
-			if action.isActive then 
+			if action.isActive and not action.actionOnly then 
 				table.insert(self.contextActionMapping, index)
 			end
 		end
@@ -1103,10 +1137,11 @@ function CpCourseGeneratorFrame:getNumberOfItemsInSection(list, section)
 	if list == self.contextButtonCustomFieldList then 
 		self.contextActionMapping = {}
 		for index, action in pairs(self.contextActions) do 
-			if action.isActive then 
+			if action.isActive and not action.actionOnly then 
 				table.insert(self.contextActionMapping, index)
 			end
 		end
+	
 		return #self.contextActionMapping
 	end
 	if list == self.activeWorkerList then 
@@ -1154,6 +1189,12 @@ function CpCourseGeneratorFrame:populateCellForItemInSection(list, section, inde
 		g_inGameMenu.pageMapOverview.assignItemColors(self, 
 			cell:getAttribute("iconBg"), status.color, 
 			cell:getAttribute("colorTemplate")) 
+	elseif list == self.customFieldList then 
+		cell:getAttribute("icon"):setVisible(false)
+		local field = g_customFieldManager:getFieldByIndex(index)
+		if field then
+			cell:getAttribute("name"):setText(field:getName())
+		end
 	elseif list == self.contextButtonList then 
 		local buttonInfo = self.contextActions[self.contextActionMapping[index]]
 		cell:getAttribute("text"):setText(buttonInfo.text)
@@ -1210,6 +1251,11 @@ function CpCourseGeneratorFrame:onClickList(list, section, index, listElement)
 		self.hotspotStateFilter[section][index] = not self.hotspotStateFilter[section][index]
 		self.ingameMapBase:restoreDefaultFilter()
 		self:saveHotspotFilter()
+	elseif list == self.customFieldList then 
+		local field = g_customFieldManager:getFieldByIndex(index)
+		if field then 
+			self:showMapHotspot(field:getHotspot())
+		end
 	elseif list == self.activeWorkerList then
 		local job = g_currentMission.aiSystem:getJobById(self.playerFarmActiveJobs[index])
 		if job ~= nil and not job.vehicleParameter then
@@ -1268,6 +1314,22 @@ function CpCourseGeneratorFrame:mouseEvent(posX, posY, isDown, isUp, button, eve
 		local worldX, worldZ = self.ingameMap:localToWorldPos(localX, localY)
 		self.aiTargetMapHotspot:setWorldPosition(worldX, worldZ)
 	end
+	if self.mode == self.AI_MODE_DRAW_CUSTOM_FIELD then 
+		if button == Input.MOUSE_BUTTON_RIGHT then 
+			if isUp and g_updateLoopIndex > self.drawDelay then 
+				local localX, localY = self.ingameMap:getLocalPosition(posX, posY)
+				local worldX, worldZ = self.ingameMap:localToWorldPos(localX, localY)
+				if #self.drawFieldBorderPolygon > 0 then 
+					local point = self.customFieldPlot:getNextTargetPoint()
+					self.drawFieldBorderPolygon:append(Vertex(point.x, -point.z))
+				else 
+					self.drawFieldBorderPolygon:append(Vertex(worldX, -worldZ))
+				end
+				self.customFieldPlot:setWaypointsFromPolygon(self.drawFieldBorderPolygon)
+				self.drawDelay = g_updateLoopIndex + self.DRAW_DELAY
+			end
+		end
+	end
 	return CpCourseGeneratorFrame:superClass().mouseEvent(self, posX, posY, isDown, isUp, button, eventUsed)
 end
 
@@ -1414,6 +1476,22 @@ function CpCourseGeneratorFrame:initializeContextActions()
 				end
 			end,
 			isActive = false
+		},
+		[self.CONTEXT_ACTIONS.DRAW_CUSTOM_FIELD] = {
+			callback = function()
+				self:onClickDrawCustomField()
+			end,
+			action = InputAction.MENU_MAP_ACTION_1,
+			isActive = false,
+			actionOnly = true
+		},
+		[self.CONTEXT_ACTIONS.HOTSPOT_SELECT_ALL] = {
+			callback = function()
+				self:onClickDeselectAll()
+			end,
+			action = InputAction.MENU_MAP_ACTION_1,
+			isActive = false,
+			actionOnly = true
 		}
 	}
 end
@@ -1437,11 +1515,18 @@ function CpCourseGeneratorFrame:updateContextActions()
 	self.contextActions[self.CONTEXT_ACTIONS.DELETE_CUSTOM_FIELD].isActive = self.currentHotspot and self.currentHotspot:isa(CustomFieldHotspot)
 	self.contextActions[self.CONTEXT_ACTIONS.RENAME_CUSTOM_FIELD].isActive = self.currentHotspot and self.currentHotspot:isa(CustomFieldHotspot)
 	self.contextActions[self.CONTEXT_ACTIONS.EDIT_CUSTOM_FIELD].isActive = self.currentHotspot and self.currentHotspot:isa(CustomFieldHotspot)
+	self.contextActions[self.CONTEXT_ACTIONS.DRAW_CUSTOM_FIELD].isActive = self.mapOverviewSelector:getState() == self.MAP_SELECTOR_CUSTOM_FIELDS
+	self.contextActions[self.CONTEXT_ACTIONS.HOTSPOT_SELECT_ALL].isActive = self.mapOverviewSelector:getState() == self.MAP_SELECTOR_HOTSPOT
 	for _, action in ipairs(self.contextActions) do 
 		if action.action then 
 			g_inputBinding:removeActionEventsByActionName(action.action)
 		end
 	end
+	for _, action in ipairs(self.contextActions) do 
+		if action.action and action.isActive and action.actionOnly then 
+			g_inputBinding:registerActionEvent(action.action, self, action.callback, false, true, false, true)
+		end
+	end
 	self.contextButtonList:reloadData()	
 	self.contextButtonCustomFieldList:reloadData()
 	self.createJobButtonList:reloadData()
diff --git a/scripts/gui/plots/CoursePlot.lua b/scripts/gui/plots/CoursePlot.lua
index e111fae50..4ffd56645 100644
--- a/scripts/gui/plots/CoursePlot.lua
+++ b/scripts/gui/plots/CoursePlot.lua
@@ -64,6 +64,14 @@ function CoursePlot:setDrawingArrows(draw)
 	self.drawArrows = draw
 end
 
+---@param polygon Polygon
+function CoursePlot:setWaypointsFromPolygon(polygon)
+	self.waypoints = {}
+	for _, v in polygon:vertices() do
+		table.insert(self.waypoints, Waypoint.initFromGeneratedWp(v))
+	end
+end
+
 function CoursePlot:setWaypoints( waypoints )
 	self.waypoints = {}
 	-- remove waypoints from long straight lines, the plot only needs start/end. Too many waypoints
diff --git a/scripts/gui/plots/FieldPlot.lua b/scripts/gui/plots/FieldPlot.lua
index 665d17df0..1e93a52a8 100644
--- a/scripts/gui/plots/FieldPlot.lua
+++ b/scripts/gui/plots/FieldPlot.lua
@@ -49,6 +49,10 @@ function FieldPlot:setNextTargetPoint(x, z)
 	self.nextTargetPoint = {x = x, z = z}
 end
 
+function FieldPlot:getNextTargetPoint()
+	return self.nextTargetPoint
+end
+
 --- Draws custom fields.
 ---@param map table
 function FieldPlot:draw(map)
diff --git a/translations/translation_br.xml b/translations/translation_br.xml
index 5977b81d3..da6686686 100644
--- a/translations/translation_br.xml
+++ b/translations/translation_br.xml
@@ -513,6 +513,7 @@ A rota é salva automaticamente ao fechar o editor e substituir a rota seleciona
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Campo customizado"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Deseja salvar a rota gravado como campo customizado %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Deseja excluir o campo customizado %s?"/>
     <text name="CP_customFieldManager_delete" text="Excluir campo customizado"/>
@@ -778,12 +779,14 @@ No Menu AI, você verá sua borda de campo gravada.
 Ao clicar no nome, você terá a opção de excluí-lo ou renomeá-lo.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-A segunda opção é desenhar o campo customizado no mapa do menu AI.
-Se nenhum ponto de acesso estiver selecionado, você pode pressionar o botão desenhar campo customizado abaixo.
-Depois disso, um texto aparece na parte superior da tela.
-Comece clicando com o botão direito do mouse para definir a posição inicial.
-Os próximos cliques criarão linhas para o clique anterior.
-Clique no botão salvar na parte inferior para terminar de desenhar o campo 
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multi implementos e Comboio"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_cs.xml b/translations/translation_cs.xml
index 2de301aca..5cfaa7ab8 100644
--- a/translations/translation_cs.xml
+++ b/translations/translation_cs.xml
@@ -513,6 +513,7 @@
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="是否要将录制的线路范围保存为自定义田地 %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="要删除自定义田地吗 %s?"/>
     <text name="CP_customFieldManager_delete" text="删除自定义田地"/>
@@ -775,11 +776,14 @@ D： 此设置告诉当卸载机接近筒仓时，工人在筒仓或选定的停
     <text name="CP_help_page_customFieldDone_text" text="查看 AI 菜单，您将看到记录的田地边界。
 通过单击名称，您将获得删除或重命名的选项。 
 "/>
-    <text name="CP_help_page_customFieldDraw_text" text="第二个选项是在 AI 菜单地图上绘制它。
-没有选择拖拉机或其他车辆（左键单击地图上的某处），您可以选择绘制自定义田地。
-开始时，将显示文本右键单击绘制自定义田地线。
-使用鼠标右键单击要开始的位置。
-下一次右键单击将从您的起点画一条线到您的第二个位置，这将是下一条线的起点。
+    <text name="CP_help_page_customFieldDraw_text" text="The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="多工具与车队"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_ct.xml b/translations/translation_ct.xml
index 59e34edce..ff5c7cce1 100644
--- a/translations/translation_ct.xml
+++ b/translations/translation_ct.xml
@@ -513,6 +513,7 @@
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="是否要將錄製的任務儲存為自訂田地 %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="要刪除自訂田地嗎 %s?"/>
     <text name="CP_customFieldManager_delete" text="刪除自訂田地"/>
@@ -767,11 +768,14 @@ D: This setting tells the worker to wait in the silo or at a selected parking po
     <text name="CP_help_page_customFieldDone_text" text="查看 AI 菜單，您將看到記錄的田地邊界。
 通過單擊名稱，您將獲得刪除或重命名的選項。 
 "/>
-    <text name="CP_help_page_customFieldDraw_text" text="第二個選項是在 AI 菜單地圖上繪製它。
-沒有選擇拖拉機或其他車輛（左鍵單擊地圖上的某處），您可以選擇繪製自訂田地。
-開始時，將顯示文本右鍵單擊繪製自訂田地線。
-使用滑鼠右鍵單擊要開始的位置。
-下一次右鍵單擊將從您的起點畫一條線到您的第二個位置，這將是下一條線的起點。
+    <text name="CP_help_page_customFieldDraw_text" text="The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="多工具與車隊"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_cz.xml b/translations/translation_cz.xml
index 591a5fd75..3f1d72c0f 100644
--- a/translations/translation_cz.xml
+++ b/translations/translation_cz.xml
@@ -513,6 +513,7 @@ Trasa se automaticky uloží při zavření editoru a přepíše vybranou trasu.
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Vlastní pole"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Chcete uložit zaznamenanou trasu jako vlastní pole %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Chcete odstranit vlastní pole %s?"/>
     <text name="CP_customFieldManager_delete" text="Vymazat vlastní pole"/>
@@ -768,11 +769,14 @@ Když se podíváte na nabídku AI, uvidíte hranici zaznamenaného pole.
 Kliknutím na Název získáte možnost jej buď smazat, nebo přejmenovat.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-Druhou možností je nakreslit jej na AI Menu Map.
-Nemáte-li vybraný žádný traktor nebo jiné vozidlo (klikněte levým tlačítkem někam na mapu), získáte možnost nakreslit vlastní pole.
-Po spuštění se zobrazí text kreslení vlastních čar pole kliknutím pravým tlačítkem.
-Pomocí pravého tlačítka myši klikněte na pozici, kde chcete začít.
-Další kliknutí pravým tlačítkem nakreslí čáru z vašeho počátečního bodu do vaší druhé pozice, která bude počátečním bodem pro další čáru.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Více strojů a konvoj"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_da.xml b/translations/translation_da.xml
index de5548477..e9caca57d 100644
--- a/translations/translation_da.xml
+++ b/translations/translation_da.xml
@@ -513,6 +513,7 @@ Ruten gemmes automatisk ved lukning af editoren og tilsidesætter den valgte rut
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Ønsker du at gemme den optegnede rute som en brugerdefineret mark %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Ønsker du at slette den brugerdefinerede mark %s?"/>
     <text name="CP_customFieldManager_delete" text="Slet brugerdefineret mark"/>
@@ -770,11 +771,14 @@ Den optegnede mark i AI hjælper menu.
 Hvis du klikker på navnet til marken, for du nu mulighed for at omdøbe den eller slette den.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-Den næste mulighed er at optegne den inde i AI hjælper menu på kortet.
-Du må ikke sidde i et køretøj (venstreklik på kortet), du for nu mulighed for at optagne marken.
-Når den startes, vil teksten Optegn brugerdefineret mark med højre museknap. Blive vist.
-Brug den højre museknap til at klikke på en position, hvor du vil starte.
-Det næste højreklik vil tegne en linje fra dit startpunkt til din anden position, som vil være startpunktet for den næste linje.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="konvoj"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_de.xml b/translations/translation_de.xml
index bc5921ceb..775ea03f8 100644
--- a/translations/translation_de.xml
+++ b/translations/translation_de.xml
@@ -513,6 +513,7 @@ Der Kurs wird beim Schließen automatisch gespeichert und überschrieben.
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Randkurs"/>
+    <text name="CP_customFieldManager_fieldList" text="Randkurse"/>
     <text name="CP_customFieldManager_confirm_save" text="Möchtest du diesen benutzerdefinierten Randkurs als %s speichern?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Möchtest du den Randkurs %s löschen?"/>
     <text name="CP_customFieldManager_delete" text="Randkurs löschen"/>
@@ -772,11 +773,14 @@ Im Helfermenü kannst du deinen Randkurs mit Namen sehen.
 Wenn du auf den Namen klickst, kannst du den Kurs löschen, umbenennen, oder mit dem Editor bearbeiten.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-Die zweite Option ist das Zeichnen im Helfermenü.
-Dazu darfst du kein Fahrzeug ausgewählt haben (Linksklick irgendwo auf der Karte) und du bekommst die Option, einen Randkurs zu zeichnen.
-Wenn du das Zeichnen gestartet hast, wird der Text &quot;Zeichne einen Randkurs&quot; angezeigt.
+Die zweite Option ist das Zeichnen im CP Helfermenü.
+Start der Aufzeichnung geht mit dem Button unten links oder der entsprechenden Taste.
+Wenn du das Zeichnen gestartet hast, wird der Text 'Zeichne einen Randkurs' angezeigt.
 Mit der rechten Maustaste kannst du jetzt den ersten Punkt setzen.
+Mit der shift-Taste lässt sich die Linie im 90° Winkel gehalten.
 Mit einem weiteren Rechtsklick wird eine Linie von deinem ersten zum zweiten Punkt gezogen, der zweite Punkt ist nun wieder der Startpunkt für die nächste Linie.
+Nach der zweiten Linie wird der Randkurs automatisch geschlossen. Du kannst trotzdem weitere Linien hinzufügen um das Feld genauer zu definieren.
+Es wird keine letzte Linie zum Startpunkt benötigt, da diese automatisch direkt zum start erzeugt wird.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool und Fahrzeugverband"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_ea.xml b/translations/translation_ea.xml
index bd8405912..01dd5ba82 100644
--- a/translations/translation_ea.xml
+++ b/translations/translation_ea.xml
@@ -513,6 +513,7 @@ El curso se guarda automáticamente al cerrar el editor y anula el curso selecci
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Campo Personalizado"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="¿Quieres guardar la ruta como campo personalizado %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="¿Quieres eliminar el campo personalizado %s?"/>
     <text name="CP_customFieldManager_delete" text="Borrar Campo Personalizado"/>
@@ -775,12 +776,14 @@ Los bordes de los campos personalizados se mostrarán en el menú de IA.
 Al hacer clic en el nombre, tendrá la opción de eliminarlo, cambiarle el nombre o editarlo con el editor.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-La segunda opción es dibujar el campo personalizado en el mapa del menú AI.
-Si no se selecciona ningún punto de acceso, puede presionar el botón Dibujar campo personalizado que se encuentra a continuación.
-Después de eso, aparecerá un texto en la parte superior de la pantalla.
-Comience haciendo clic con el botón derecho del mouse para establecer la posición de inicio.
-Los siguientes clics crearán líneas hasta el clic anterior.
-Haga clic en el botón Guardar en la parte inferior para terminar de dibujar el campo.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multiherramientas y Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_en.xml b/translations/translation_en.xml
index 2c9fa16c1..6b439754e 100644
--- a/translations/translation_en.xml
+++ b/translations/translation_en.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Do you want to save the recorded course as custom field %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Do you want to delete the custom field %s?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -780,12 +781,14 @@ The custom field borders will be displayed in the AI menu.
 By clicking on the name you will get the option to either delete, rename or edit it with the editor.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_es.xml b/translations/translation_es.xml
index 26a3e1a50..78edd0e6a 100644
--- a/translations/translation_es.xml
+++ b/translations/translation_es.xml
@@ -513,6 +513,7 @@ El curso se guarda automáticamente al cerrar el editor y anula el curso selecci
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Campo Personalizado"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="¿Quieres guardar la ruta como campo personalizado %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="¿Quieres eliminar el campo personalizado %s?"/>
     <text name="CP_customFieldManager_delete" text="Borrar Campo Personalizado"/>
@@ -775,12 +776,14 @@ Los bordes de los campos personalizados se mostrarán en el menú de IA.
 Al hacer clic en el nombre, tendrá la opción de eliminarlo, cambiarle el nombre o editarlo con el editor.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-La segunda opción es dibujar el campo personalizado en el mapa del menú AI.
-Si no se selecciona ningún punto de acceso, puede presionar el botón Dibujar campo personalizado que se encuentra a continuación.
-Después de eso, aparecerá un texto en la parte superior de la pantalla.
-Comience haciendo clic con el botón derecho del mouse para establecer la posición de inicio.
-Los siguientes clics crearán líneas hasta el clic anterior.
-Haga clic en el botón Guardar en la parte inferior para terminar de dibujar el campo.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multiherramientas y Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_fc.xml b/translations/translation_fc.xml
index 473990ecf..f6a78ba2a 100644
--- a/translations/translation_fc.xml
+++ b/translations/translation_fc.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Do you want to save the recorded course as custom field %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Do you want to delete the custom field %s?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -771,12 +772,14 @@ The custom field borders will be displayed in the AI menu.
 By clicking on the name you will get the option to either delete or rename it.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_fi.xml b/translations/translation_fi.xml
index 89648342b..e28c57637 100644
--- a/translations/translation_fi.xml
+++ b/translations/translation_fi.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Do you want to save the recorded course as custom field %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Do you want to delete the custom field %s?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -771,12 +772,14 @@ The custom field borders will be displayed in the AI menu.
 By clicking on the name you will get the option to either delete or rename it.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_fr.xml b/translations/translation_fr.xml
index 6ffa53ea2..c30173a5f 100644
--- a/translations/translation_fr.xml
+++ b/translations/translation_fr.xml
@@ -513,6 +513,7 @@ La course est automatiquement sauvegardée à la fermeture de l'éditeur et remp
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Souhaitez-vous sauvegarder la course enregistrée comme contour de champ personnalisé %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Souhaitez-vous supprimer le champ personnalisé %s?"/>
     <text name="CP_customFieldManager_delete" text="Supprimer le champ personnalisé"/>
@@ -762,11 +763,14 @@ Les contours du champ personnalisé apparaissent dans l'onglet des ouvriers.
 Cliquez sur son nom pour le supprimer ou le renommer.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-La deuxième option est de placer les contours du champ depuis la carte dans l'onglet des ouvriers.
-Clic gauche n'importe où sur la carte (afin de ne pas sélectionner de véhicules) puis choisissez l'option tracer un champ personnalisé.
-Vous serez invité à tracer des lignes correspondantes au contour du champ à l'aide du clic droit.
-Le premier clic droit détermine le point de départ du contour.
-Les prochains clics droits formeront des lignes correspondantes au contour du champ personnalisé. Procédez ainsi jusqu'à clôturer intégralement le champ personnalisé.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Outils multiples et convoi"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_hu.xml b/translations/translation_hu.xml
index 8bb0cb24a..83e0892e6 100644
--- a/translations/translation_hu.xml
+++ b/translations/translation_hu.xml
@@ -513,6 +513,7 @@ Az útvonal automatikusan mentésre kerül a szerkesztő bezárásakor és felü
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Egyedi mező"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="El akarod menteni az útvonalat szántóföldként %s néven?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Törlöd a %s szántóföldet?"/>
     <text name="CP_customFieldManager_delete" text="Szántóföld törlés"/>
@@ -771,11 +772,14 @@ Ha megnézed az AI menüt, látni fogod a rögzített mezőszegélyt.
 A névre kattintva lehetősége van törölni vagy átnevezni.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-A második lehetőség az AI menütérképre való felrajzolása.
-Ha nem választottál ki traktort vagy más járművet (bal kattintás valahol a térképen), lehetőséged van egyéni mező rajzolására.
-Indításkor az egyéni mezővonalak jobb gombbal történő rajzolása jelenik meg.
-Használd a jobb egérgombot, hogy rákattints arra a pozícióra, ahol el szeretnéd kezdeni.
-A következő jobb kattintás egy vonalat húz a kezdőponttól a második pozícióig, amely a következő sor kezdőpontja lesz.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Több eszköz és konvoj"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_id.xml b/translations/translation_id.xml
index d4032d413..bd4d41177 100644
--- a/translations/translation_id.xml
+++ b/translations/translation_id.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Do you want to save the recorded course as custom field %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Do you want to delete the custom field %s?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -780,12 +781,14 @@ The custom field borders will be displayed in the AI menu.
 By clicking on the name you will get the option to either delete, rename or edit it with the editor.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_it.xml b/translations/translation_it.xml
index d74244bbe..433970aad 100644
--- a/translations/translation_it.xml
+++ b/translations/translation_it.xml
@@ -513,6 +513,7 @@ Il percorso viene salvato automaticamente alla chiusura dell'editor e sovrascriv
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Campo personalizzato"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Vuoi salvare il percorso registrato come campo personalizzato %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Vuoi eliminare il campo personalizzato %s?"/>
     <text name="CP_customFieldManager_delete" text="Cancella campo personalizzato"/>
@@ -780,12 +781,14 @@ Dando un'occhiata al menu IA, vedrai il bordo del tuo campo registrato.
 Facendo clic sul Nome, avrai la possibilità di eliminarlo o rinominarlo.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-La seconda opzione è disegnare il campo personalizzato sulla mappa del menu IA.
-Se non è selezionato alcun hotspot, puoi premere il pulsante disegna campo personalizzato qui sotto.
-Dopodiché, nella parte superiore dello schermo appare un testo.
-Inizia cliccando con il tasto destro del mouse per impostare la posizione di partenza.
-I clic successivi creeranno linee per il clic precedente.
-Fai clic sul pulsante salva in basso per terminare di disegnare il campo.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multiveicoli e convoglio"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_jp.xml b/translations/translation_jp.xml
index ec6a9ff02..4e923aa8c 100644
--- a/translations/translation_jp.xml
+++ b/translations/translation_jp.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="カスタムコース「%s」を保存しますか?"/>
     <text name="CP_customFieldManager_confirm_delete" text="カスタムフィールド「%s」を消去しますか?"/>
     <text name="CP_customFieldManager_delete" text="カスタムフィールドを消去する"/>
@@ -771,11 +772,14 @@ AIメニューを見ると、レコードしたフィールドの境界線が表
 名前をクリックすると、削除するか、名前を変更するかのオプションが表示されます。
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-2つ目の選択肢は、AIメニューマップに描くことです。
-トラクターや他の車両が選択されていない状態（マップ上のどこかを左クリック）で、カスタムフィールドを描くオプションが表示されます。
-起動すると、「右クリックでカスタムフィールドの線を描く」というテキストが表示されます。
-マウスの右ボタンを使って、開始したい位置をクリックします。
-次の右クリックで、開始点から2番目の位置まで線が引かれます。
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_kr.xml b/translations/translation_kr.xml
index 0a826daa6..b4a5d9f65 100644
--- a/translations/translation_kr.xml
+++ b/translations/translation_kr.xml
@@ -512,6 +512,7 @@
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="사용자 지정 필드"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="기록된 경로를 사용자 지정 필드 %s로 저장하시겠습니까?"/>
     <text name="CP_customFieldManager_confirm_delete" text="사용자 지정 필드 %s를 삭제하시겠습니까?"/>
     <text name="CP_customFieldManager_delete" text="사용자 지정 필드 삭제"/>
@@ -812,13 +813,14 @@ D: 하역 차량이 사일로에 접근할 때, 작업자가 사일로 내부에
 이름을 클릭하면 해당 필드를 삭제하거나 이름을 변경할 수 있는 옵션이 나타납니다.  
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-두 번째 방법은 AI 메뉴의 지도에서 사용자 지정 필드를 직접 그리는 것입니다.  
-핫스팟이 선택되지 않은 경우, 아래에 있는 '사용자 지정 필드 그리기' 버튼을 누르세요.  
-그러면 화면 상단에 안내 문구가 나타납니다.  
-
-먼저 마우스 오른쪽 버튼을 클릭하여 시작 위치를 설정합니다.  
-이후 클릭할 때마다 이전 클릭한 위치와 선이 연결됩니다.  
-필드 그리기를 완료하려면 화면 하단의 '저장' 버튼을 클릭하세요.  
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start. 
 "/>
     <text name="CP_help_page_multiConvoy_title" text="다중 작업 및 대열 주행"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_nl.xml b/translations/translation_nl.xml
index 519c4d119..f5afb1621 100644
--- a/translations/translation_nl.xml
+++ b/translations/translation_nl.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Wil je de geregistreerde koers opslaan als aangepast veld %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Wilt u het aangepaste veld %s verwijderen?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -771,11 +772,14 @@ Having a look on the AI Menu, you will see your recorded field border.
 By clicking on the Name, you will get the option to either delete it or rename it.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw it on the AI Menu Map.
-Have no tractor or other vehicle selected (left click somewhere on the map), you get the option to draw a custom field.
-When started, the text draw custom field lines with right click will be displayed.
-Use the right mouse button to click on a position on where you want to start.
-The next right click will draw a line from your startpoint to your second position, wich will be the start point for the next line.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_no.xml b/translations/translation_no.xml
index e1ec5ad6e..520eecdf5 100644
--- a/translations/translation_no.xml
+++ b/translations/translation_no.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Do you want to save the recorded course as custom field %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Do you want to delete the custom field %s?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -771,12 +772,14 @@ The custom field borders will be displayed in the AI menu.
 By clicking on the name you will get the option to either delete or rename it.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_pl.xml b/translations/translation_pl.xml
index 996c280da..a4778fcf9 100644
--- a/translations/translation_pl.xml
+++ b/translations/translation_pl.xml
@@ -513,6 +513,7 @@ Kurs jest automatycznie zapisywany po zamknięciu edytora i nadpisuje wybrany ku
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Nowe pole"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Czy chcesz zapisać nagrany kurs jako nowe pole %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Czy chcesz usunąć nowe pole %s?"/>
     <text name="CP_customFieldManager_delete" text="Usuń nowe pole"/>
@@ -761,10 +762,14 @@ Gdy gotowe, wciśnij przycisk ponownie a zostaniesz zapytany czy zapisać to pol
 Klikając na NAZWĘ, dostaniesz opcję usunięcia go lub zmiany nazwy.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="Druga opcja to narysowanie go na mapie w menu pomocników SI.
-Nie miej wybranego żadnego ciągnika czy innego pojazdu (kliknij lewym przyciskiem gdzieś na mapie), pojawi się wtedy opcja narysowania nowego pola.
-Po rozpoczęciu zostanie wyświetlony tekst rysujący linie nowego pola za pomocą prawego przycisku myszy.
-Użyj prawego przycisku myszy, aby kliknąć na pozycję, gdzie chcesz zacząć.
-Następne prawe kliknięcie narysuje linię od punktu początkowego do obecnej pozycji kursora, będzie to punk początku nowej linii.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Wiele maszyn i konwój"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_pt.xml b/translations/translation_pt.xml
index 712112a3e..5190ff39b 100644
--- a/translations/translation_pt.xml
+++ b/translations/translation_pt.xml
@@ -513,6 +513,7 @@ A rota é guardada automaticamente ao fechar o editor e sobrepõe-se a qualquer
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Queres guardar a rota gravada como um campo personalizado %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Queres apagar o campo personalizado %s?"/>
     <text name="CP_customFieldManager_delete" text="Apagar o campo personalizado"/>
@@ -766,11 +767,14 @@ Dando uma olhada no Menu AI, você verá sua borda de campo gravada.
 Ao clicar no nome, você terá a opção de excluí-lo ou renomeá-lo.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-A segunda opção é desenhá-lo no Mapa do Menu AI.
-Não tenha nenhum trator ou outro veículo selecionado (clique com o botão esquerdo em algum lugar no mapa), você tem a opção de desenhar um campo personalizado.
-Quando iniciado, o texto desenha linhas de campo personalizadas com o botão direito do mouse será exibido.
-Use o botão direito do mouse para clicar em uma posição em que você deseja começar.
-O próximo clique direito desenhará uma linha do seu ponto inicial até a sua segunda posição, que será o ponto inicial da próxima linha.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multiferramenta e Comboio"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_ro.xml b/translations/translation_ro.xml
index ea298a574..b2f3e031d 100644
--- a/translations/translation_ro.xml
+++ b/translations/translation_ro.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Do you want to save the recorded course as custom field %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Do you want to delete the custom field %s?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -771,12 +772,14 @@ The custom field borders will be displayed in the AI menu.
 By clicking on the name you will get the option to either delete or rename it.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_ru.xml b/translations/translation_ru.xml
index 21b6e59c1..75335f8ca 100644
--- a/translations/translation_ru.xml
+++ b/translations/translation_ru.xml
@@ -513,6 +513,7 @@
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Пользовательское поле"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Вы хотите сохранить записанный курс как пользовательское поле %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Вы хотите удалить пользовательское поле %s?"/>
     <text name="CP_customFieldManager_delete" text="Удалить пользовательское поле"/>
@@ -774,11 +775,14 @@ D: Эта настройка говорит работнику ждать в с
 Нажав на имя, вы получите возможность либо удалить его или переименовать.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-Второй вариант - нарисовать его на карте в меню ИИ.
-Не выделяя трактор или другую технику (левым щелчком где-то на карте) вы получаете возможность нарисовать пользовательское поле.
-После начала рисования будут отображаться линии пользовательских полевых нарисованных правой кнопкой мыши.
-Используйте правую кнопку мыши, чтобы нажать на место, где вы хотите начать.
-Следующий щелчок правой кнопкой мыши нарисует линию от старта ко второй точки, которая будет начальной точкой для следующей линии.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Совместная работа и колонна"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_sv.xml b/translations/translation_sv.xml
index b0142a4df..4e1f170b6 100644
--- a/translations/translation_sv.xml
+++ b/translations/translation_sv.xml
@@ -513,6 +513,7 @@ Banan sparas automatiskt vid stängning av editorn och åsidosätter den valda b
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Vill du spara den inspelade kursen som anpassat fält %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Vill du radera det anpassade fältet %s?"/>
     <text name="CP_customFieldManager_delete" text="Ta bort anpassat fält"/>
@@ -769,11 +770,14 @@ När du är klar trycker du på knappen igen och du kommer att bli ombedd om du
 Med en titt på AI-menyn kommer du att se din inspelade fältgräns.
 Genom att klicka på namnet får du möjlighet att antingen radera det eller byt namn på det."/>
     <text name="CP_help_page_customFieldDraw_text" text="
-Det andra alternativet är att rita det på AI-menyn.
-Har ingen traktor eller annat fordon valts (vänsterklicka någonstans på kartan), du får möjlighet att rita ett anpassat fält.
-När du startat, tecknar texten anpassade fältlinjer med högerklick visas.
-Använd höger musknapp för att klicka på en position där du vill börja.
-Nästa högerklick kommer att rita en linje från din startpunkt till din andra position, vilket kommer att vara startpunkten för nästa rad.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multiredskap and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_tr.xml b/translations/translation_tr.xml
index 82f4e1a6c..58a247e3a 100644
--- a/translations/translation_tr.xml
+++ b/translations/translation_tr.xml
@@ -513,6 +513,7 @@ Düzenleyici kapatıldığında rota otomatik olarak kaydedilir ve önceki rotay
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Özel çalışma alanı"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Kaydı yapılan rotayı özel çalışma alanı %s olarak kaydetmek istiyor musunuz?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Özel çalışma alanı %s'i silmek istiyor musunuz?"/>
     <text name="CP_customFieldManager_delete" text="Özel çalışma alanını sil"/>
@@ -780,12 +781,14 @@ Başlangıç ve bitiş noktalarının üst üste binmemesi gerektiğini unutmay
 İsmine tıkladığınızda silme, yeniden adlandırma veya düzenleyici ile düzenleme seçenekleri çıkacaktır.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-İkinci yöntem, özel çalışma alanı sınırlarını YZ menüsündeki harita üzerinde çizmektir.
-Herhangi bir şey seçili değilken alt kısımdaki 'Özel Çalışma Alanı Çiz' butonuna tıklayın.
-Sonrasında ekranın üst kısmında bir metin görünecektir.
-Başlangıç noktasını belirlemek için sağ tıklayın.
-Sonraki tıklamalar, bir önceki noktadan itibaren çizgiler oluşturacaktır.
-Tarla çizmeyi bitirmek için alt kısımdaki Kaydet butonuna tıklayın..
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Çoklu araç ve Konvoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_uk.xml b/translations/translation_uk.xml
index b9200a925..47e982d7a 100644
--- a/translations/translation_uk.xml
+++ b/translations/translation_uk.xml
@@ -513,6 +513,7 @@
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Користувацьке поле"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Бажаєте зберегти записаний маршрут як користувацьке поле %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Бажаєте видалити користувацьке поле %s?"/>
     <text name="CP_customFieldManager_delete" text="Видалити користувацьке поле"/>
@@ -778,11 +779,14 @@ D: Цей параметр вказує працівнику де чекати 
 Натиснувши на ім’я, ви отримаєте можливість видалити його або перейменувати.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-Другий варіант - намалювати його на карті в меню ШІ.
-Не вибираючи трактор або іншу техніку (лівим кліком десь на карті), ви отримуєте можливість намалювати користувацьке поле.
-Після початку малювання будуть відображатися лінії користувацьких полів, намальованих правою кнопкою миші.
-Використовуйте праву кнопку миші, щоб натискати на місце, де ви хочете почати.
-Наступний клік правою кнопкою миші намалює лінію від початку до другої точки, яка буде початковою точкою для наступної лінії.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
+After that a text appears on the top of your screen.
+Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
+The next clicks will create lines to the previous click.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Сумісна робота та колонна"/>
     <text name="CP_help_page_multitoolBasic_text" text="
diff --git a/translations/translation_vi.xml b/translations/translation_vi.xml
index e3b0cacd9..522bc5758 100644
--- a/translations/translation_vi.xml
+++ b/translations/translation_vi.xml
@@ -513,6 +513,7 @@ The course is saved automatically on closing of the editor and overrides the sel
     <!--Custom field manager-->
     <!---->
     <text name="CP_customFieldManager_hotspotName" text="Custom field"/>
+    <text name="CP_customFieldManager_fieldList" text="Custom fields"/>
     <text name="CP_customFieldManager_confirm_save" text="Do you want to save the recorded course as custom field %s?"/>
     <text name="CP_customFieldManager_confirm_delete" text="Do you want to delete the custom field %s?"/>
     <text name="CP_customFieldManager_delete" text="Delete custom field"/>
@@ -780,12 +781,14 @@ The custom field borders will be displayed in the AI menu.
 By clicking on the name you will get the option to either delete, rename or edit it with the editor.
 "/>
     <text name="CP_help_page_customFieldDraw_text" text="
-The second option is to draw the custom field on the map of the AI menu.
-If no hotspot is selected, you can press the draw custom field button below.
+The second option is to draw the custom field on the map of the CP AI menu.
+To start the drawing, hit they button on the bottom left corner or hit corresponding key.
 After that a text appears on the top of your screen.
 Start by clicking the right mouse button for setting the start position.
+By holding the shift key, the line will be set straight in 90° angles.
 The next clicks will create lines to the previous click.
-Click the save button at the bottom to finish drawing the field.
+Once you draw a second line, the course will be automatically closed. You can still draw more lines to define the field even further.
+You don't need to draw the last line to the start, as it gets generated automatically straight to the start.
 "/>
     <text name="CP_help_page_multiConvoy_title" text="Multitool and Convoy"/>
     <text name="CP_help_page_multitoolBasic_text" text="