diff --git a/d2common/d2enum/numeric_labels.go b/d2common/d2enum/numeric_labels.go
index 6383b6e5..eb2253b6 100644
--- a/d2common/d2enum/numeric_labels.go
+++ b/d2common/d2enum/numeric_labels.go
@@ -2,7 +2,9 @@ package d2enum
 
 // there are labels for "numeric labels (see AssetManager.TranslateLabel)
 const (
-	CancelLabel = iota
+	RepairAll = iota
+	_
+	CancelLabel
 	CopyrightLabel
 	AllRightsReservedLabel
 	SinglePlayerLabel
@@ -62,6 +64,8 @@ const (
 // BaseLabelNumbers returns base label value (#n in english string table table)
 func BaseLabelNumbers(idx int) int {
 	baseLabelNumbers := []int{
+		128, // repairAll
+		127,
 		// main menu labels
 		1612, // CANCEL
 		1613, // (c) 2000 Blizzard Entertainment
diff --git a/d2core/d2inventory/inventory_item_factory.go b/d2core/d2inventory/inventory_item_factory.go
index fb081fcc..7cf1d273 100644
--- a/d2core/d2inventory/inventory_item_factory.go
+++ b/d2core/d2inventory/inventory_item_factory.go
@@ -136,7 +136,6 @@ func (f *InventoryItemFactory) GetMiscItemByCode(code string) (*InventoryItemMis
 
 // GetWeaponItemByCode returns the weapon item for the given code
 func (f *InventoryItemFactory) GetWeaponItemByCode(code string) (*InventoryItemWeapon, error) {
-	// https://github.com/OpenDiablo2/OpenDiablo2/issues/796
 	result := f.asset.Records.Item.Weapons[code]
 	if result == nil {
 		return nil, fmt.Errorf("could not find weapon entry for code '%s'", code)
diff --git a/d2core/d2map/d2mapentity/factory.go b/d2core/d2map/d2mapentity/factory.go
index 1e24824d..181b05c2 100644
--- a/d2core/d2map/d2mapentity/factory.go
+++ b/d2core/d2map/d2mapentity/factory.go
@@ -237,7 +237,6 @@ func (f *MapEntityFactory) NewCastOverlay(x, y int, overlayRecord *d2records.Ove
 		return nil, err
 	}
 
-	// https://github.com/OpenDiablo2/OpenDiablo2/issues/767
 	animation.Rewind()
 	animation.ResetPlayedCount()
 
diff --git a/d2core/d2ui/button.go b/d2core/d2ui/button.go
index 91bd8437..71b0cefd 100644
--- a/d2core/d2ui/button.go
+++ b/d2core/d2ui/button.go
@@ -863,8 +863,6 @@ type buttonStateDescriptor struct {
 
 func (v *Button) createTooltip() {
 	var t *Tooltip
-	// this is also related with https://github.com/OpenDiablo2/OpenDiablo2/issues/944
-	// all strings starting with "#" could be wrong translated to another locales
 	switch v.buttonLayout.Tooltip {
 	case buttonTooltipNone:
 		return
@@ -885,7 +883,7 @@ func (v *Button) createTooltip() {
 		t.SetText(v.manager.asset.TranslateString("NPCRepairItems"))
 	case buttonTooltipRepairAll:
 		t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
-		t.SetText(v.manager.asset.TranslateString("#128"))
+		t.SetText(v.manager.asset.TranslateLabel(d2enum.RepairAll))
 	case buttonTooltipLeftArrow:
 		t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
 		t.SetText(v.manager.asset.TranslateString("KeyLeft"))
diff --git a/d2game/d2player/hud.go b/d2game/d2player/hud.go
index caa2b44e..4b7a2bef 100644
--- a/d2game/d2player/hud.go
+++ b/d2game/d2player/hud.go
@@ -258,7 +258,6 @@ func (h *HUD) loadCustomWidgets() {
 }
 
 func (h *HUD) loadSkillResources() {
-	// https://github.com/OpenDiablo2/OpenDiablo2/issues/799
 	genericSkillsSprite, err := h.uiManager.NewSprite(d2resource.GenericSkills, d2resource.PaletteSky)
 	if err != nil {
 		h.Error(err.Error())
@@ -376,7 +375,6 @@ func (h *HUD) onToggleRunButton(noButton bool) {
 	h.hero.ToggleRunWalk()
 	h.updateRunTooltipText()
 
-	// https://github.com/OpenDiablo2/OpenDiablo2/issues/800
 	h.hero.SetIsRunning(h.hero.IsRunToggled())
 }