Index: sql/mangos.sql
===================================================================
--- sql/mangos.sql	(revision 5497)
+++ sql/mangos.sql	(working copy)
@@ -10062,10 +10062,10 @@
 (11083,0,0,0x0000000000C20017,0),
 (11095,0,0,0x0000000000000010,0),
 (11124,0,0,0x0000000008C20017,0),
-(11151,0,0,0x00000000000002E0,0),
-(11160,0,0,0x00000001020003E0,0),
+(11151,0,0,0x00000000000202E0,0),
+(11160,0,0,0x00000001020203E0,0),
 (11175,1,0,0x0000000000100000,0),
-(11207,0,0,0x00000000000002E0,0),
+(11207,0,0,0x00000000000202E0,0),
 (11222,0,0,0x0000000020001800,0),
 (11242,0,0,0x0000000020001000,0),
 (11247,0,0,0x0000000000002000,0),
@@ -10102,8 +10102,8 @@
 (12473,0,0,0x0000000000000020,0),
 (12496,0,0,0x0000000000100000,0),
 (12497,0,0,0x0000000000100000,0),
-(12518,0,0,0x00000001020003E0,0),
-(12519,0,0,0x00000001020003E0,0),
+(12518,0,0,0x00000001020203E0,0),
+(12519,0,0,0x00000001020203E0,0),
 (12536,0,0,0x0000000020C01AF7,0),
 (12569,1,0,0x0000000000100000,0),
 (12571,1,0,0x0000000000100000,0),
@@ -10112,7 +10112,7 @@
 (12659,0,0,0x0000000000000020,0),
 (12665,1,0,0x0000000000000080,0),
 (12666,1,0,0x0000000000000080,0),
-(12672,0,0,0x00000000000002E0,0),
+(12672,0,0,0x00000000000202E0,0),
 (12676,1,0,0x0000000002000000,0),
 (12676,2,0,0x0000040000000000,0),
 (12677,1,0,0x0000000002000000,0),
@@ -10148,10 +10148,10 @@
 (12873,0,0,0x0000000000000010,0),
 (12945,0,0,0x0000000000001000,0),
 (12945,1,0,0x0000000000001000,0),
-(12952,0,0,0x00000000000002E0,0),
-(12953,0,0,0x00000000000002E0,0),
-(12954,0,0,0x00000000000002E0,0),
-(12957,0,0,0x00000000000002E0,0),
+(12952,0,0,0x00000000000202E0,0),
+(12953,0,0,0x00000000000202E0,0),
+(12954,0,0,0x00000000000202E0,0),
+(12957,0,0,0x00000000000202E0,0),
 (12963,0,0,0x0000000000000004,0),
 (13742,0,0,0x0000000000000060,0),
 (13743,0,0,0x0000000000000040,0),
@@ -10250,9 +10250,9 @@
 (15017,1,0,0x0000000000100080,0),
 (15018,0,0,0x0000002000000200,0),
 (15020,0,0,0x0000000000000040,0),
-(15047,0,0,0x00000000000002E0,0),
-(15052,0,0,0x00000000000002E0,0),
-(15053,0,0,0x00000000000002E0,0),
+(15047,0,0,0x00000000000202E0,0),
+(15052,0,0,0x00000000000202E0,0),
+(15053,0,0,0x00000000000202E0,0),
 (15257,0,0,0x000004020288A010,0),
 (15259,0,0,0x0000000202002000,0),
 (15259,1,0,0x0000040000808000,0),
@@ -10384,8 +10384,8 @@
 (16720,0,0,0x000000080001E000,0),
 (16720,1,0,0x000000000001E000,0),
 (16720,2,0,0x000000000001E000,0),
-(16757,0,0,0x00000000000000A0,0),
-(16758,0,0,0x00000000000000A0,0),
+(16757,0,0,0x00000000000200A0,0),
+(16758,0,0,0x00000000000200A0,0),
 (16763,0,0,0x0000000000000020,0),
 (16765,0,0,0x0000000000000020,0),
 (16766,0,0,0x0000000000000020,0),
@@ -11020,11 +11020,11 @@
 (33877,0,0,0x0000000000000002,0),
 (33879,0,0,0x0000000000000020,0),
 (33880,0,0,0x0000000000000020,0),
-(33886,0,0,0x00000010000000d0,0),
-(33887,0,0,0x00000010000000d0,0),
-(33888,0,0,0x00000010000000d0,0),
-(33889,0,0,0x00000010000000d0,0),
-(33890,0,0,0x00000010000000d0,0),
+(33886,0,0,0x00000010000000D0,0),
+(33887,0,0,0x00000010000000D0,0),
+(33888,0,0,0x00000010000000D0,0),
+(33889,0,0,0x00000010000000D0,0),
+(33890,0,0,0x00000010000000D0,0),
 (34128,0,0,0x0000001000000000,0),
 (34129,0,0,0x0000000040000000,0),
 (34129,1,0,0x0000000040000000,0),
Index: sql/updates/5498_mangos_spell_affect.sql
===================================================================
--- sql/updates/5498_mangos_spell_affect.sql	(revision 0)
+++ sql/updates/5498_mangos_spell_affect.sql	(revision 0)
@@ -0,0 +1,8 @@
+-- Ice Shards
+UPDATE spell_affect SET SpellFamilyMask = SpellFamilyMask | 0x20000 WHERE (entry = 11207) OR (entry = 12672) OR (entry = 15047) OR (entry = 15052) OR (entry = 15053);
+-- Piercing Ice
+UPDATE spell_affect SET SpellFamilyMask = SpellFamilyMask | 0x20000 WHERE ((entry = 11151) OR (entry = 12952) OR (entry = 12953) OR (entry = 12954) OR (entry = 12957)) AND (effectId = 0);
+-- Arctic Reach
+UPDATE spell_affect SET SpellFamilyMask = SpellFamilyMask | 0x20000 WHERE ((entry = 16757) OR (entry = 16758)) AND (effectId = 0);
+-- Frost Channeling
+UPDATE spell_affect SET SpellFamilyMask = SpellFamilyMask | 0x20000 WHERE ((entry = 11160) OR (entry = 12518) OR (entry = 12519)) AND (effectId = 0);
\ No newline at end of file
Index: sql/updates/Makefile.am
===================================================================
--- sql/updates/Makefile.am	(revision 5497)
+++ sql/updates/Makefile.am	(working copy)
@@ -651,6 +651,7 @@
 	5482_mangos_spell_affect.sql \
 	5491_mangos_player_levelstats.sql \
 	5492_mangos_player_levelstats.sql \
+	5498_mangos_spell_affect.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -1282,4 +1283,5 @@
 	5482_mangos_spell_affect.sql \
 	5491_mangos_player_levelstats.sql \
 	5492_mangos_player_levelstats.sql \
+	5498_mangos_spell_affect.sql \
 	README
Index: src/game/Unit.cpp
===================================================================
--- src/game/Unit.cpp	(revision 5497)
+++ src/game/Unit.cpp	(working copy)
@@ -7080,13 +7080,7 @@
 
         // adds additional damage to crit_bonus (from talents)
         if(Player* modOwner = GetSpellModOwner())
-        {
-            // Ice Lance (have spell flags common with fire spells, then apply mod in code), use Frostbite that have semilar SPELLMOD_CRIT_DAMAGE_BONUS bonuses
-            if((spellProto->SpellFamilyFlags & 0x20000LL) && spellProto->SpellIconID == 186)
-                modOwner->ApplySpellMod(116, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
-            else
-                modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
-        }
+            modOwner->ApplySpellMod(spellProto->Id, SPELLMOD_CRIT_DAMAGE_BONUS, crit_bonus);
     
         if(pVictim)
         {