diff --git a/Data/scripts/commands/EquipCommand.lua b/Data/scripts/commands/EquipCommand.lua
index 75af2f10..37639946 100644
--- a/Data/scripts/commands/EquipCommand.lua
+++ b/Data/scripts/commands/EquipCommand.lua
@@ -200,6 +200,7 @@ function equipItem(player, equipSlot, item)
 				player:GraphicChange(GRAPHICSLOT_SPMAINHAND, 899,2,0,0);
 				player:GraphicChange(GRAPHICSLOT_SPOFFHAND,  899,2,0,0);
 			elseif (gItem:IsGoldSmithWeapon()) then
+				player:GraphicChange(GRAPHICSLOT_OFFHAND, 	 729,1,0,0);
 				player:GraphicChange(GRAPHICSLOT_SPMAINHAND, 898,1,0,0);
 			elseif (gItem:IsTannerWeapon()) then
 				player:GraphicChange(GRAPHICSLOT_SPMAINHAND, 898,3,0,0);
@@ -211,6 +212,9 @@ function equipItem(player, equipSlot, item)
 			elseif (gItem:IsCulinarianWeapon()) then 
 				player:GraphicChange(GRAPHICSLOT_SPMAINHAND, 900,2,0,0);
 				player:GraphicChange(GRAPHICSLOT_SPOFFHAND,  898,2,0,0);
+			else
+				player:GraphicChange(GRAPHICSLOT_SPMAINHAND, 0,0,0,0);
+				player:GraphicChange(GRAPHICSLOT_SPOFFHAND,  0,0,0,0);
 			end
 		end
 		
@@ -248,6 +252,7 @@ function unequipItem(player, equipSlot, item)
 			elseif (equipSlot == EQUIPSLOT_LFINGER) then player:GraphicChange(GRAPHICSLOT_L_RINGFINGER, nil);
 			end
 		end	
+		
 		return true;
 	end
 end
diff --git a/Data/sql/gamedata_items_graphics.sql b/Data/sql/gamedata_items_graphics.sql
index a92229d4..8088b902 100644
--- a/Data/sql/gamedata_items_graphics.sql
+++ b/Data/sql/gamedata_items_graphics.sql
@@ -11,11 +11,6 @@
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 
-
--- Dumping database structure for ffxiv_server
-CREATE DATABASE IF NOT EXISTS `ffxiv_server` /*!40100 DEFAULT CHARACTER SET latin1 */;
-USE `ffxiv_server`;
-
 -- Dumping structure for table ffxiv_server.gamedata_items_graphics
 DROP TABLE IF EXISTS `gamedata_items_graphics`;
 CREATE TABLE IF NOT EXISTS `gamedata_items_graphics` (