diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp
index 840ab34ce..50cb1294d 100644
--- a/indra/newview/llfloatercustomize.cpp
+++ b/indra/newview/llfloatercustomize.cpp
@@ -450,10 +450,13 @@ LLPanelEditWearable::LLPanelEditWearable( EWearableType type )
 BOOL LLPanelEditWearable::postBuild()
 {
 	LLAssetType::EType asset_type = LLWearable::typeToAssetType( mType );
-	std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
+	/*std::string icon_name = (asset_type == LLAssetType::AT_CLOTHING ?
 										 "inv_item_clothing.tga" :
-										 "inv_item_skin.tga" );
-	childSetValue("icon", icon_name);
+										 "inv_item_skin.tga" );*/
+	std::string icon_name = get_item_icon_name(asset_type,LLInventoryType::IT_WEARABLE,mType,FALSE);
+
+ 									childSetValue("icon", icon_name);
+									childSetValue("icon", icon_name);
 
 	childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this );
 
@@ -2210,6 +2213,7 @@ void LLFloaterCustomize::initWearablePanels()
 		part->mTargetOffset.setVec(0.f, 0.f, 0.1f);
 		part->mCameraOffset.setVec(-2.5f, 0.5f, 0.8f);
 		panel->addSubpart(LLStringUtil::null, SUBPART_TATTOO, part);
+		panel->addColorSwatch(TEX_LOWER_TATTOO, "Color/Tint");
 
 		panel->addTextureDropTarget(TEX_LOWER_TATTOO, "Lower Tattoo",
 									LLUUID::null,
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 09cc3d662..406c8dd76 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1525,6 +1525,7 @@ void LLVOAvatar::initClass()
 	}
 
 	{
+		updateClientTags();
 		loadClientTags();
 	}
 }
@@ -8589,6 +8590,14 @@ BOOL LLVOAvatar::teToColorParams( ETextureIndex te, const char* param_name[3] )
 		param_name[2] = "skirt_blue";
 		break;
 
+	case TEX_HEAD_TATTOO:
+	case TEX_LOWER_TATTOO:
+	case TEX_UPPER_TATTOO:
+		param_name[0] = "tattoo_red";
+		param_name[1] = "tattoo_green";
+		param_name[2] = "tattoo_blue";
+		break;	
+
 	default:
 		llassert(0);
 		return FALSE;
diff --git a/indra/newview/skins/default/xui/en-us/floater_customize.xml b/indra/newview/skins/default/xui/en-us/floater_customize.xml
index 25b86f06c..17b3a5f37 100644
--- a/indra/newview/skins/default/xui/en-us/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_customize.xml
@@ -1190,11 +1190,15 @@ scratch and wear it.
             <texture_picker name="Lower Tattoo" label="Lower Tattoo" tool_tip="Click to choose a picture"
              can_apply_immediately="true" default_image_name="Default" allow_no_texture="true"
              follows="left|top" width="70" height="80" left="14" bottom="-325"/>
+			<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom="-415"
+			 can_apply_immediately="true" color="1 1 1 1" follows="left|top" height="80"
+			 label="Color/Tint" left="14" mouse_opaque="true" name="Color/Tint"
+			 tool_tip="Click to open Color Picker" width="70" />
 			<button name="Create New" label="Create New Tattoo" label_selected="Create New Tattoo"
                  follows="left|top" halign="center" width="170" height="24" left="8" bottom="-128"
 			     mouse_opaque="true" scale_image="true"/>
             <button name="Take Off" label="Take Off" label_selected="Take Off"
-             follows="left|top" width="82" height="20" left="8" bottom="-365"/>
+             follows="left|top" width="82" height="20" left="8" bottom="-440"/>
             <button name="Save" label="Save" label_selected="Save"
              follows="right|bottom" width="82" height="20" left="123" bottom="-478"/>
             <button name="Save As" label="Save As..." label_selected="Save As..."