diff --git a/sql/mangos.sql b/sql/mangos.sql
index ca94c27ae..dc4cc2b0c 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`;
 CREATE TABLE `db_version` (
   `version` varchar(120) default NULL,
   `creature_ai_version` varchar(120) default NULL,
-  `required_8254_01_mangos_spell_proc_event` bit(1) default NULL
+  `required_8294_01_mangos_playercreateinfo_action` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
 
 --
@@ -9791,7 +9791,7 @@ INSERT INTO `playercreateinfo_action` VALUES
 (2,3,0,6603,0),
 (2,3,1,2973,0),
 (2,3,2,75,0),
-(2,3,4,20572,0),
+(2,3,9,20572,0),
 (2,3,10,159,128),
 (2,3,11,117,128),
 (2,4,0,6603,0),
@@ -9868,10 +9868,9 @@ INSERT INTO `playercreateinfo_action` VALUES
 (3,6,5,47541,0),
 (3,6,10,2481,0),
 (4,1,72,6603,0),
-(4,1,73,6603,0),
-(4,1,74,78,0),
-(4,1,83,58984,0),
-(4,1,84,117,128),
+(4,1,73,78,0),
+(4,1,82,58984,0),
+(4,1,83,117,128),
 (4,1,85,6603,0),
 (4,1,97,6603,0),
 (4,1,109,6603,0),
@@ -9885,8 +9884,9 @@ INSERT INTO `playercreateinfo_action` VALUES
 (4,4,1,1752,0),
 (4,4,2,2098,0),
 (4,4,3,2764,0),
-(4,4,4,58984,0),
+(4,4,10,58984,0),
 (4,4,11,4540,128),
+(4,4,82,58984,0),
 (4,5,0,6603,0),
 (4,5,1,585,0),
 (4,5,2,2050,0),
@@ -9904,7 +9904,7 @@ INSERT INTO `playercreateinfo_action` VALUES
 (4,11,0,6603,0),
 (4,11,1,5176,0),
 (4,11,2,5185,0),
-(4,11,3,58984,0),
+(4,11,9,58984,0),
 (4,11,10,159,128),
 (4,11,11,4536,128),
 (5,1,0,6603,0),
@@ -10013,9 +10013,9 @@ INSERT INTO `playercreateinfo_action` VALUES
 (7,6,4,45902,0),
 (7,6,5,47541,0),
 (7,6,10,20589,0),
-(7,6,11,117,128),
+(7,6,11,41751,128),
 (7,6,72,6603,0),
-(7,6,83,117,128),
+(7,6,83,41751,128),
 (7,6,84,6603,0),
 (7,6,96,6603,0),
 (7,6,108,6603,0),
@@ -10043,21 +10043,21 @@ INSERT INTO `playercreateinfo_action` VALUES
 (8,3,0,6603,0),
 (8,3,1,2973,0),
 (8,3,2,75,0),
+(8,3,3,20554,0),
 (8,3,10,159,128),
 (8,3,11,4604,128),
-(8,3,76,20554,0),
 (8,4,0,6603,0),
 (8,4,1,1752,0),
 (8,4,2,2098,0),
 (8,4,3,2764,0),
+(8,4,4,26297,0),
 (8,4,11,117,128),
-(8,4,76,20554,0),
 (8,5,0,6603,0),
 (8,5,1,585,0),
 (8,5,2,2050,0),
+(8,5,3,20554,0),
 (8,5,10,159,128),
 (8,5,11,4540,128),
-(8,5,76,20554,0),
 (8,6,0,6603,0),
 (8,6,1,49576,0),
 (8,6,2,45477,0),
@@ -10068,15 +10068,15 @@ INSERT INTO `playercreateinfo_action` VALUES
 (8,7,0,6603,0),
 (8,7,1,403,0),
 (8,7,2,331,0),
+(8,7,3,20554,0),
 (8,7,10,159,128),
 (8,7,11,117,128),
-(8,7,76,20554,0),
 (8,8,0,6603,0),
 (8,8,1,133,0),
 (8,8,2,168,0),
+(8,8,3,20554,0),
 (8,8,10,159,128),
 (8,8,11,117,128),
-(8,8,76,20554,0),
 (10,2,0,6603,0),
 (10,2,1,21084,0),
 (10,2,2,635,0),
@@ -10159,7 +10159,8 @@ INSERT INTO `playercreateinfo_action` VALUES
 (11,6,3,45462,0),
 (11,6,4,45902,0),
 (11,6,5,47541,0),
-(11,6,6,59545,0),
+(11,6,10,59545,0),
+(11,6,11,41751,128),
 (11,7,0,6603,0),
 (11,7,1,403,0),
 (11,7,2,331,0),
diff --git a/sql/updates/8294_01_mangos_playercreateinfo_action.sql b/sql/updates/8294_01_mangos_playercreateinfo_action.sql
new file mode 100644
index 000000000..802f3ab4f
--- /dev/null
+++ b/sql/updates/8294_01_mangos_playercreateinfo_action.sql
@@ -0,0 +1,54 @@
+ALTER TABLE db_version CHANGE COLUMN required_8254_01_mangos_spell_proc_event required_8294_01_mangos_playercreateinfo_action bit;
+
+-- Remove Double attack icons for Night Elf Warrior
+DELETE FROM playercreateinfo_action WHERE race=4 AND class=1 AND button=73;
+-- Move Heroic Strike to correct location for Night Elf Warrior
+DELETE FROM playercreateinfo_action WHERE race=4 AND class=1 AND button=74;
+INSERT INTO playercreateinfo_action VALUES (4,1,73,78,0);
+-- Moved Shadowmeld to correct location for Night Elf Warrior
+DELETE FROM playercreateinfo_action WHERE race=4 AND class=1 AND button IN (82,83);
+INSERT INTO playercreateinfo_action VALUES (4,1,82,58984,0);
+-- Add correct Tough Jerky location for Night elf Warrior
+DELETE FROM playercreateinfo_action WHERE race=4 AND class=1 AND button=84;
+INSERT INTO playercreateinfo_action VALUES (4,1,83,117,128);
+
+-- Moved Shadowmeld to correct location for Night Elf Druid
+DELETE FROM playercreateinfo_action WHERE race=4 AND class=11 AND button IN (3,9);
+INSERT INTO playercreateinfo_action VALUES (4,11,9,58984,0);
+
+-- Moved Shadowmeld to correct location for Night Elf Rogue
+DELETE FROM playercreateinfo_action WHERE race=4 AND class=4 AND button IN (4,10);
+INSERT INTO playercreateinfo_action VALUES (4,4,10,58984,0);
+-- Add Shadowmeld For Night Elf Rogue Shadow form bar
+DELETE FROM playercreateinfo_action WHERE race=4 AND class=4 AND button = 82;
+INSERT INTO playercreateinfo_action VALUES (4,4,82,58984,0);
+
+-- Replace Tough Jerky for Gnome Death Knight Action Bar
+DELETE FROM playercreateinfo_action WHERE race=7 AND class=6 AND button IN (11,83);
+INSERT INTO playercreateinfo_action VALUES
+(7,6,11,41751,128),
+(7,6,83,41751,128);
+
+-- Moved Gift of Naaru to correct location for Draenei Death Knight
+DELETE FROM playercreateinfo_action WHERE race=11 AND class=6 AND button IN (6,10);
+INSERT INTO playercreateinfo_action VALUES (11,6,10,59545,0);
+-- Add Black Mushroom to Draenei Death Knight Action Bar
+DELETE FROM playercreateinfo_action WHERE race=11 AND class=6 AND button IN (11);
+INSERT INTO playercreateinfo_action VALUES
+(11,6,11,41751,128);
+
+-- Moved Blood Fury to correct action bar location for Orc Hunter
+DELETE FROM playercreateinfo_action WHERE race=2 AND class=3 AND button IN (4,9);
+INSERT INTO playercreateinfo_action VALUES (2,3,9,20572,0);
+
+-- Moved Berserking to correct action bar location for Non-Heroic Troll classes 
+DELETE FROM playercreateinfo_action WHERE race=8 AND class IN (3,5,7,8) AND button IN (3,76);
+INSERT INTO playercreateinfo_action VALUES
+(8,3,3,20554,0),
+(8,5,3,20554,0),
+(8,7,3,20554,0),
+(8,8,3,20554,0);
+
+-- Updated and moved Berserking skill for Troll Rogue
+DELETE FROM playercreateinfo_action WHERE race=8 AND class=4 AND button IN (4,76);
+INSERT INTO playercreateinfo_action VALUES (8,4,4,26297,0);
diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am
index 3a26346aa..602620106 100644
--- a/sql/updates/Makefile.am
+++ b/sql/updates/Makefile.am
@@ -261,6 +261,7 @@ pkgdata_DATA = \
 	8253_01_mangos_spell_chain.sql \
 	8253_02_mangos_spell_proc_event.sql \
 	8254_01_mangos_spell_proc_event.sql \
+	8294_01_mangos_playercreateinfo_action.sql \
 	README
 
 ## Additional files to include when running 'make dist'
@@ -502,4 +503,5 @@ EXTRA_DIST = \
 	8253_01_mangos_spell_chain.sql \
 	8253_02_mangos_spell_proc_event.sql \
 	8254_01_mangos_spell_proc_event.sql \
+	8294_01_mangos_playercreateinfo_action.sql \
 	README
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 510976ed6..37931f69d 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -688,14 +688,14 @@ bool Player::Create( uint32 guidlow, const std::string& name, uint8 race, uint8
                 switch(iProto->Spells[0].SpellCategory)
                 {
                     case 11:                                // food
-                        if(iProto->Stackable > 4)
-                            count = 4;
+                        count = getClass()==CLASS_DEATH_KNIGHT ? 10 : 4;
                         break;
                     case 59:                                // drink
-                        if(iProto->Stackable > 2)
-                            count = 2;
+                        count = 2;
                         break;
                 }
+                if(iProto->Stackable < count)
+                    count = iProto->Stackable;
             }
 
             StoreNewItemInBestSlots(item_id, count);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index f6dddb53b..5a6dbd95c 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "8293"
+ #define REVISION_NR "8294"
 #endif // __REVISION_NR_H__