diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 98f4881eb6a15a5a29de73e20d62d77e67365143..05de782838547ac3b233211b8aa814988c8b914e 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -2720,21 +2720,26 @@ void LLPanelPreferenceControls::populateControlTable()
         return;
     }
 
-    std::string full_filename = gDirUtilp->findSkinnedFilenameBaseLang(LLDir::XUI, filename);
-    LLSimpleXUIParser parser;
+    LLXMLNodePtr xmlNode;
     LLScrollListCtrl::Contents contents;
-    if (!parser.readXUI(full_filename, contents)
-        || !contents.validateBlock())
+    if (!LLUICtrlFactory::getLayeredXMLNode(filename, xmlNode))
+    {
+    LL_WARNS() << "Failed to load " << filename << LL_ENDL;
+    return;
+    }
+    LLXUIParser parser;
+    parser.readXUI(xmlNode, contents, filename);
+
+    if (!contents.validateBlock())
     {
-        LL_INFOS() << "Failed to load" << LL_ENDL;
         return;
     }
 
-    for (LLInitParam::ParamIterator<LLScrollListColumn::Params>::const_iterator row_it = contents.columns.begin();
-        row_it != contents.columns.end();
-        ++row_it)
+    for (LLInitParam::ParamIterator<LLScrollListColumn::Params>::const_iterator col_it = contents.columns.begin();
+        col_it != contents.columns.end();
+        ++col_it)
     {
-        pControlsTable->addColumn(*row_it);
+        pControlsTable->addColumn(*col_it);
     }
 
     LLScrollListCell::Params cell_params;
diff --git a/indra/newview/skins/default/xui/en/control_table_contents.xml b/indra/newview/skins/default/xui/en/control_table_contents.xml
index 288075628c741f952bd308fe4e1a4b21e9e7f834..da9cceb2db0465c14ff7ace14857dd4b7be0b2fe 100644
--- a/indra/newview/skins/default/xui/en/control_table_contents.xml
+++ b/indra/newview/skins/default/xui/en/control_table_contents.xml
@@ -18,6 +18,7 @@
      name="lst_ctrl3" />
     <rows
      enabled="false"
+     name="move_actions"
      value="">
         <columns
          type="icontext"
@@ -202,6 +203,7 @@
     </rows>
     <rows
      enabled="false"
+     name="camera_actions"
      value="">
         <columns
          type="icontext"
@@ -424,6 +426,7 @@
     </rows>
     <rows
      enabled="false"
+     name="editing_actions"
      value="">
         <columns
          type="icontext"
@@ -502,6 +505,7 @@
     </rows>
     <rows
      enabled="false"
+     name="media_actions"
      value="">
         <columns
          type="icontext"