diff --git a/Modules/Tracker/QuestieTracker.lua b/Modules/Tracker/QuestieTracker.lua
index 8604f19..03e9c12 100644
--- a/Modules/Tracker/QuestieTracker.lua
+++ b/Modules/Tracker/QuestieTracker.lua
@@ -974,7 +974,7 @@ function QuestieTracker:Update()
                         line.criteriaMark:Hide()
 
                         -- Set Min/Max Button and default states
-                        line.expandQuest:SetPoint("TOPRIGHT", line, "TOPLEFT", questMarginLeft - 8, 1)
+                        line.expandQuest:SetPoint("TOPRIGHT", line, "TOPLEFT", questMarginLeft - 4, 1)
                         line.expandQuest.zoneId = zoneName
 
 
@@ -1179,7 +1179,8 @@ function QuestieTracker:Update()
                                 end
 
                                 -- Attach button to Quest Title linePool
-                                button:SetPoint("TOPLEFT", button.line, "TOPLEFT", 0, 0)
+                                button:SetPoint("TOPLEFT", button.line, "TOPLEFT",
+                                    TrackerLinePool.GetItemButtonOffset(), 0)
                                 button:SetParent(button.line)
                                 button:Show()
 
@@ -1291,7 +1292,7 @@ function QuestieTracker:Update()
 
                                             -- Attach button to Quest Title linePool
                                             altButton:SetPoint("TOPLEFT", altButton.line, "TOPLEFT",
-                                                2 + questItemButtonSize, 0)
+                                                TrackerLinePool.GetItemButtonOffset() + 2 + questItemButtonSize, 0)
                                             altButton:SetParent(altButton.line)
                                             altButton:Show()
 
@@ -1739,7 +1740,7 @@ function QuestieTracker:Update()
 
                         -- Set Min/Max Button and default states
                         line.expandQuest:Show()
-                        line.expandQuest:SetPoint("TOPRIGHT", line, "TOPLEFT", questMarginLeft - 8, 1)
+                        line.expandQuest:SetPoint("TOPRIGHT", line, "TOPLEFT", questMarginLeft - 4, 1)
                         line.expandQuest.zoneId = zoneName
 
                         -- The minAllQuestsInZone table is always blank until a player Shift+Clicks the Zone header (MouseDown).
diff --git a/Modules/Tracker/TrackerLinePool.lua b/Modules/Tracker/TrackerLinePool.lua
index 8f453bc..327fe95 100644
--- a/Modules/Tracker/TrackerLinePool.lua
+++ b/Modules/Tracker/TrackerLinePool.lua
@@ -116,12 +116,20 @@ local buttonPool = {}
 local lineMarginLeft = 10
 
 -- Gap kept between the supertrack button and whatever it is tucked in next to.
-local superTrackButtonGap = 2
+local superTrackButtonGap = 1
 
--- Left edge of a quest line's collapse button. QuestieTracker anchors it at questMarginLeft - 8
+-- Left edge of a quest line's collapse button. QuestieTracker anchors it at questMarginLeft - 4
 -- with a width of trackerFontSizeQuest, and questMarginLeft carries a matching + trackerFontSizeQuest,
--- so it lands on a flat 18 whatever the font size is.
-local superTrackCollapseButtonLeft = 18
+-- so it lands on a flat 22 whatever the font size is.
+local superTrackCollapseButtonLeft = 22
+
+-- Left edge of the quest item buttons. QuestieTracker anchors them there and the marker tucks in
+-- to the left of them, so the two have to agree on it.
+local questItemButtonLeft = 6
+
+function TrackerLinePool.GetItemButtonOffset()
+    return questItemButtonLeft
+end
 
 ---@param questFrame Frame
 function TrackerLinePool.Initialize(questFrame)
@@ -541,7 +549,7 @@ function TrackerLinePool.Initialize(questFrame)
         superTrackButton.AnchorSuperTrackButton = function(self)
             local buttonSize = Questie.db.profile.trackerSuperTrackButtonSize or 25
             local blockHeight = self.blockHeight or Questie.db.profile.trackerFontSizeQuest
-            local slotLeft = self.itemButtonShown and 0 or superTrackCollapseButtonLeft
+            local slotLeft = self.itemButtonShown and questItemButtonLeft or superTrackCollapseButtonLeft
             local offsetX = slotLeft - superTrackButtonGap - buttonSize
 
             -- The lines live inside the tracker's scroll frame, which clips anything hanging over