diff --git a/changelog.md b/changelog.md
index 21cedd5..56d9c10 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@ v1.14.21:
 - Fixed TargetCC/FocusCC modules on Wrath Classic.
 - Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
 - Fixed Buff/Debuff Watchers showing an empty bar when set to Missing mode. If the background was disabled, this looked like just a floating spell icon.
+- Fixed spell icons sometimes not showing up for custom bars until the tracked spell had been cast once.
 
 v1.14.20:
 
diff --git a/modules/CustomBar.lua b/modules/CustomBar.lua
index 708fc93..68f9c34 100644
--- a/modules/CustomBar.lua
+++ b/modules/CustomBar.lua
@@ -83,6 +83,7 @@ function IceCustomBar.prototype:Enable(core)
 	self:FixupTextColors()
 	self:SetCustomTextColor(self.frame.bottomUpperText, self.moduleSettings.upperTextColor)
 	self:SetCustomTextColor(self.frame.bottomLowerText, self.moduleSettings.lowerTextColor)
+	self:UpdateAuraIcon()
 end
 
 function IceCustomBar.prototype:Disable(core)
@@ -204,6 +205,7 @@ end
 function IceCustomBar.prototype:Redraw()
 	IceCustomBar.super.prototype.Redraw(self)
 
+	self:UpdateAuraIcon()
 	self:UpdateCustomBar(self.unit)
 end
 
@@ -903,3 +905,13 @@ function IceCustomBar.prototype:Show(bShouldShow, bForceHide)
 		IceCustomBar.super.prototype.Show(self, bShouldShow)
 	end
 end
+
+function IceCustomBar.prototype:UpdateAuraIcon()
+	if not self.barFrame or not self.barFrame.icon then
+		return
+	end
+
+	local _, _, auraIcon = GetSpellInfo(self.moduleSettings.buffToTrack)
+
+	self.barFrame.icon:SetTexture(auraIcon)
+end
diff --git a/this_version.md b/this_version.md
index c4e9162..85d1340 100644
--- a/this_version.md
+++ b/this_version.md
@@ -6,6 +6,7 @@ v1.14.21:
 - Fixed TargetCC/FocusCC modules on Wrath Classic.
 - Fixed disabled Buff/Debuff Watchers showing a static gray bar when set to When Missing or Always display modes.
 - Fixed Buff/Debuff Watchers showing an empty bar when set to Missing mode. If the background was disabled, this looked like just a floating spell icon.
+- Fixed spell icons sometimes not showing up for custom bars until the tracked spell had been cast once.
 
 v1.14.20: