diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 434899574e..67ed57464a 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -141,7 +141,9 @@ void LLUICtrlFactory::createChildren(LLView* viewp, LLXMLNodePtr node, const wid
                 //LL_WARNS() << child_name << " is not a valid child of " << node->getName()->mString << LL_ENDL;
                 std::string name;
                 node->getAttributeString("name", name);
-                LL_WARNS() << child_name << " is not a valid child of " << node->getName()->mString << " for " << name << " (line no. " << node->getLineNumber() << ")" << LL_ENDL;
+                std::string child_name_attribute;
+                child_node->getAttributeString("name", child_name_attribute);
+                LL_WARNS() << child_name << " with name " << child_name_attribute << " is not a valid child of " << node->getName()->mString << " for " << name << " (line no. " << node->getLineNumber() << ")" << LL_ENDL;
                 // </FS:Ansariel>
             }
             else
diff --git a/indra/newview/fspanelface.cpp b/indra/newview/fspanelface.cpp
index 3b5535e08b..10ad1aa3c8 100644
--- a/indra/newview/fspanelface.cpp
+++ b/indra/newview/fspanelface.cpp
@@ -5985,22 +5985,22 @@ void FSPanelFace::selectPBRChannel(S32 pbr_channel)
 {
     if (pbr_channel == PBRTYPE_NORMAL)
     {
-        mTabsMatChannel->selectTabByName("panel_pbr_transforms_base_color");
+        mTabsPBRChannel->selectTabByName("panel_pbr_transforms_normal");
     }
     else if (pbr_channel == PBRTYPE_BASE_COLOR)
     {
-        mTabsMatChannel->selectTabByName("panel_pbr_transforms_normal");
+        mTabsPBRChannel->selectTabByName("panel_pbr_transforms_base_color");
     }
     else if (pbr_channel == PBRTYPE_METALLIC_ROUGHNESS)
     {
-        mTabsMatChannel->selectTabByName("panel_pbr_transforms_metallic");
+        mTabsPBRChannel->selectTabByName("panel_pbr_transforms_metallic");
     }
     else if (pbr_channel == PBRTYPE_EMISSIVE)
     {
-        mTabsMatChannel->selectTabByName("panel_pbr_transforms_emissive");
+        mTabsPBRChannel->selectTabByName("panel_pbr_transforms_emissive");
     }
     else
     {
-        mTabsMatChannel->selectTabByName("panel_pbr_transforms_all");
+        mTabsPBRChannel->selectTabByName("panel_pbr_transforms_all");
     }
 }
diff --git a/indra/newview/skins/default/xui/de/panel_fs_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_fs_tools_texture.xml
index 6b996ff83a..fa19700ac1 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_tools_texture.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_tools_texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Texture">
+<panel name="Texture" label="Textur">
 	<panel.string name="paste_error_face_selection_mismatch">
 		Falls mehrere Flächen kopiert werden, müssen auf dem Zielobjekt dieselbe Anzahl an Flächen selektiert sein.
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 64e72e62cb..dc8ec946c9 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -3282,14 +3282,14 @@ Low ↔ Lwst
              top_pad="8"
              width="132" />
         </panel>
+<!--	<FS:Zi> switchable edit texture/materials panel
         <panel
          label="Texture"
          help_topic="toolbox_texture_tab"
          name="Texture">
-<!--	<FS:Zi> switchable edit texture/materials panel
          filename="panel_tools_texture.xml">
--->
 	   </panel>
+-->
        <panel
          border="false"
          follows="all"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_fs_tools_texture.xml
index a3ee4dc65c..4b0d52139c 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_tools_texture.xml
@@ -111,7 +111,6 @@
    name="base_color_tint_picker"
    label="Tint"
    can_apply_immediately="true"
-   allow_no_texture="true"
    tool_tip="Click to choose the base color tint"
 />
 
@@ -2110,7 +2109,6 @@
    max_val="255"
    increment="1"
    decimal_digits="0"
-   text_readonly_color="LabelDisabledColor"
    enabled_control="FSInternalFaceHasBPSpecularMap"
 />
 
@@ -2958,7 +2956,6 @@
    top_pad="5"
    right="-4"
    height="2"
-   visibility_control="FSInternalCanEditObjectFaces"
 />
 
 <panel
diff --git a/indra/newview/skins/starlight/xui/en/floater_tools.xml b/indra/newview/skins/starlight/xui/en/floater_tools.xml
index 9ae008bbc8..0e10d331d7 100644
--- a/indra/newview/skins/starlight/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlight/xui/en/floater_tools.xml
@@ -3280,14 +3280,13 @@ Low ↔ Lwst
              top_pad="8"
              width="132" />
         </panel>
+<!--	<FS:Zi> switchable edit texture/materials panel
         <panel
          label="Texture"
          help_topic="toolbox_texture_tab"
-         name="Texture">
-<!--	<FS:Zi> switchable edit texture/materials panel
          filename="panel_tools_texture.xml">
--->
 	   </panel>
+-->
        <panel
          border="false"
          follows="all"
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
index 9ae008bbc8..97b4d49fea 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml
@@ -3280,14 +3280,14 @@ Low ↔ Lwst
              top_pad="8"
              width="132" />
         </panel>
+<!--	<FS:Zi> switchable edit texture/materials panel
         <panel
          label="Texture"
          help_topic="toolbox_texture_tab"
          name="Texture">
-<!--	<FS:Zi> switchable edit texture/materials panel
          filename="panel_tools_texture.xml">
--->
 	   </panel>
+-->
        <panel
          border="false"
          follows="all"
diff --git a/indra/newview/skins/vintage/xui/en/floater_tools.xml b/indra/newview/skins/vintage/xui/en/floater_tools.xml
index 589936f445..2428970032 100644
--- a/indra/newview/skins/vintage/xui/en/floater_tools.xml
+++ b/indra/newview/skins/vintage/xui/en/floater_tools.xml
@@ -3281,14 +3281,14 @@ Low ↔ Lwst
              top_pad="8"
              width="132" />
         </panel>
+<!--	<FS:Zi> switchable edit texture/materials panel
         <panel
          label="Texture"
          help_topic="toolbox_texture_tab"
          name="Texture">
-<!--	<FS:Zi> switchable edit texture/materials panel
          filename="panel_tools_texture.xml">
--->
 	   </panel>
+-->
        <panel
          border="false"
          follows="all"