diff --git a/Data.lua b/Data.lua
index 8eb2bc0..2197f9b 100644
--- a/Data.lua
+++ b/Data.lua
@@ -1307,7 +1307,7 @@ _V["WQT_ZONE_MAPCOORDS"] = {
 			[210] = {["x"] = 0.42, ["y"] = 0.62} -- Cape
 			,[50] = {["x"] = 0.67, ["y"] = 0.40} -- North
 		}
-		,[947]	= { -- All of Azeroth
+		,[947]	= { -- All of Azeroth (Also look at UpdateAzerothZones() in Dataprovider.lua)
 			[12] = {["x"] = 0.24, ["y"] = 0.55}
 			,[13] = {["x"] = 0.89, ["y"] = 0.52}
 			,[113] = {["x"] = 0.49, ["y"] = 0.12}
@@ -1514,6 +1514,12 @@ end
 
 -- This is just easier to maintain than changing the entire string every time
 _V["PATCH_NOTES"] = {
+		{["version"] = "10.0.7.1",
+			["fixes"] = {
+				[[Fixed "Vol'dun" bug.]],
+				'Fixed "Elite Ring" size.',
+			},
+		},
 		{["version"] = "10.0.7.0",
 			["new"] ={
 				"Added new Dragonflight zones and factions.",
diff --git a/Dataprovider.lua b/Dataprovider.lua
index e26e3a7..ede3d9a 100644
--- a/Dataprovider.lua
+++ b/Dataprovider.lua
@@ -24,17 +24,19 @@ local function UpdateAzerothZones(newLevel)
 	wipe(worldTable);
 	
 	-- world map continents depending on expansion level
-	worldTable[113] = {["x"] = 0.49, ["y"] = 0.13} -- Northrend
-	worldTable[424] = {["x"] = 0.46, ["y"] = 0.92} -- Pandaria
-	worldTable[12] = {["x"] = 0.19, ["y"] = 0.5} -- Kalimdor
-	worldTable[13] = {["x"] = 0.88, ["y"] = 0.56} -- Eastern Kingdom
+	worldTable[113] = {["x"] = 0.49, ["y"] = 0.12} -- Northrend
+	worldTable[424] = {["x"] = 0.48, ["y"] = 0.82} -- Pandaria
+	worldTable[12] = {["x"] = 0.24, ["y"] = 0.55} -- Kalimdor
+	worldTable[13] = {["x"] = 0.89, ["y"] = 0.52} -- Eastern Kingdom
 	
-	-- Always take the highest expansion
-	if (expLevel >= LE_EXPANSION_BATTLE_FOR_AZEROTH and newLevel >= 50) then
-		worldTable[875] = {["x"] = 0.54, ["y"] = 0.61} -- Zandalar
-		worldTable[876] = {["x"] = 0.72, ["y"] = 0.49} -- Kul Tiras
-	elseif (expLevel >= LE_EXPANSION_LEGION and newLevel >= 50) then
-		worldTable[619] = {["x"] = 0.6, ["y"] = 0.41} -- Broken Isles
+	-- Always take the highest expansion 
+	if (expLevel >= LE_EXPANSION_DRAGONFLIGHT and newLevel >= 58) then
+		worldTable[1978] = {["x"] = 0.77, ["y"] = 0.22} -- Dragon Isles
+	elseif (expLevel >= LE_EXPANSION_BATTLE_FOR_AZEROTH and newLevel >= 50) then
+		worldTable[875] = {["x"] = 0.54, ["y"] = 0.63} -- Zandalar
+		worldTable[876] = {["x"] = 0.71, ["y"] = 0.50} -- Kul Tiras
+	elseif (expLevel >= LE_EXPANSION_LEGION and newLevel >= 45) then
+		worldTable[619] = {["x"] = 0.58, ["y"] = 0.39} -- Broken Isles
 	end
 end
 
@@ -682,6 +684,11 @@ function WQT_DataProvider:AddQuest(qInfo)
 	
 	local questInfo = self.pool:Acquire();
 	local alwaysHide = not MapUtil.ShouldShowTask(qInfo.mapID, qInfo);
+	
+	-- Dragonflight devs forgot to flagged some tech quests with "MapUtil.ShouldShowTask", and past it in Vol'dun location.
+	-- It make Vol'dun's map messy. This should fix it.
+	if (qInfo.questId > 60000) and (qInfo.mapID == 864) then alwaysHide = true; end
+	
 	local posX, posY = WQT_Utils:GetQuestMapLocation(qInfo.questId, qInfo.mapID);
 	local haveRewardData = questInfo:Init(qInfo.questId, qInfo.isDaily, qInfo.isCombatAllyQuest, alwaysHide, posX, posY);
 
diff --git a/MapPinProvider.xml b/MapPinProvider.xml
index f65e4c1..bb9becc 100644
--- a/MapPinProvider.xml
+++ b/MapPinProvider.xml
@@ -12,8 +12,8 @@
 			<Layer level="BACKGROUND" textureSubLevel="3">
 				<Texture parentKey="CustomUnderlay" atlas="worldquest-questmarker-dragon" hidden="true">
 					<Anchors>
-						<Anchor point="TOPLEFT" x="-5" y="4"/>
-						<Anchor point="BOTTOMRIGHT" x="5" y="-5"/>
+						<Anchor point="TOPLEFT" x="-12" y="11"/>
+						<Anchor point="BOTTOMRIGHT" x="10" y="-10"/>
 					</Anchors>
 				</Texture>
 				<Texture parentKey="Icon">
diff --git a/WorldQuestTab.toc b/WorldQuestTab.toc
index 9b69d0c..81bc69b 100644
--- a/WorldQuestTab.toc
+++ b/WorldQuestTab.toc
@@ -2,10 +2,11 @@
 ## Title: World Quest Tab
 ## Notes: Creates a new quest tab to keep track of world quests.
 ## Author: LanceDH
-## Version: 10.0.7.0
+## Version: 10.0.7.1
 ## SavedVariables: BWQDB
 ## X-Website: https://www.curseforge.com/wow/addons/worldquesttab
 ## X-Curse-Project-ID: 102243
+## IconTexture: Interface\Worldmap\UI-World-Icon
 
 WorldQuestTab.xml
 External\External.xml