diff --git a/src/Gui/PreferencePages/DlgSettingsLightSources.ui b/src/Gui/PreferencePages/DlgSettingsLightSources.ui
index 59f516abd5..7f543a6c3a 100644
--- a/src/Gui/PreferencePages/DlgSettingsLightSources.ui
+++ b/src/Gui/PreferencePages/DlgSettingsLightSources.ui
@@ -22,9 +22,6 @@
        <verstretch>2</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip">
-      <string>Adjust the orientation of the directional light source by dragging the handle with the mouse or use the spin boxes for fine tuning.</string>
-     </property>
      <property name="title">
       <string>Preview</string>
      </property>
diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp
index 9b4c3a6f49..26c50f9af5 100644
--- a/src/Mod/Fem/Gui/Command.cpp
+++ b/src/Mod/Fem/Gui/Command.cpp
@@ -882,8 +882,8 @@ CmdFemConstraintSpring::CmdFemConstraintSpring()
 {
     sAppModule = "Fem";
     sGroup = QT_TR_NOOP("Fem");
-    sMenuText = QT_TR_NOOP("Spring Constraint");
-    sToolTipText = QT_TR_NOOP("Creates a spring acting on a face");
+    sMenuText = QT_TR_NOOP("Spring Boundary Condition");
+    sToolTipText = QT_TR_NOOP("Creates a spring boundary condition on a face");
     sWhatsThis = "FEM_ConstraintSpring";
     sStatusTip = sToolTipText;
     sPixmap = "FEM_ConstraintSpring";
diff --git a/src/Mod/Fem/Gui/TaskPostFrames.ui b/src/Mod/Fem/Gui/TaskPostFrames.ui
index 1377e138b1..8c11d0562f 100644
--- a/src/Mod/Fem/Gui/TaskPostFrames.ui
+++ b/src/Mod/Fem/Gui/TaskPostFrames.ui
@@ -38,7 +38,7 @@
      <item row="0" column="1">
       <widget class="QLabel" name="Type">
        <property name="text">
-        <string>Ressonance frequencies</string>
+        <string>Resonant frequencies</string>
        </property>
       </widget>
      </item>
diff --git a/src/Mod/Fem/femcommands/commands.py b/src/Mod/Fem/femcommands/commands.py
index c8341d589f..061561cd26 100644
--- a/src/Mod/Fem/femcommands/commands.py
+++ b/src/Mod/Fem/femcommands/commands.py
@@ -731,9 +731,7 @@ class _MeshClear(CommandManager):
     def __init__(self):
         super().__init__()
         self.menutext = Qt.QT_TRANSLATE_NOOP("FEM_MeshClear", "Clear FEM Mesh")
-        self.tooltip = Qt.QT_TRANSLATE_NOOP(
-            "FEM_MeshClear", "Clears the mesh of an FEM mesh object"
-        )
+        self.tooltip = Qt.QT_TRANSLATE_NOOP("FEM_MeshClear", "Clears the mesh of a FEM mesh object")
         self.is_active = "with_femmesh"
 
     def Activated(self):
diff --git a/src/Mod/Material/App/MaterialLoader.cpp b/src/Mod/Material/App/MaterialLoader.cpp
index 175f3caaf5..fbe0c4639d 100644
--- a/src/Mod/Material/App/MaterialLoader.cpp
+++ b/src/Mod/Material/App/MaterialLoader.cpp
@@ -180,12 +180,23 @@ void MaterialYamlEntry::addToTree(
     QString author = yamlValue(yamlModel["General"], "Author", "");
     QString license = yamlValue(yamlModel["General"], "License", "");
     QString description = yamlValue(yamlModel["General"], "Description", "");
+    QString sourceReference = yamlValue(yamlModel["General"], "ReferenceSource", "");
+    QString sourceURL = yamlValue(yamlModel["General"], "SourceURL", "");
 
     std::shared_ptr<Material> finalModel =
         std::make_shared<Material>(library, directory, uuid, name);
     finalModel->setAuthor(author);
     finalModel->setLicense(license);
     finalModel->setDescription(description);
+    finalModel->setReference(sourceReference);
+    finalModel->setURL(sourceURL);
+
+    if (yamlModel["General"]["Tags"]) {
+        auto tags = readList(yamlModel["General"]["Tags"]);
+        for (auto tag : *tags) {
+            finalModel->addTag(tag.toString());
+        }
+    }
 
     // Add inheritance list
     if (yamlModel["Inherits"]) {
diff --git a/src/Mod/Material/App/Materials.cpp b/src/Mod/Material/App/Materials.cpp
index f2122dbf77..11afb9f78f 100644
--- a/src/Mod/Material/App/Materials.cpp
+++ b/src/Mod/Material/App/Materials.cpp
@@ -699,6 +699,19 @@ void Material::removeUUID(QSet<QString>& uuidList, const QString& uuid)
     uuidList.remove(uuid);
 }
 
+void Material::addTag(const QString& tag)
+{
+    auto trimmed = tag.trimmed();
+    if (!trimmed.isEmpty()) {
+        _tags.insert(trimmed);
+    }
+}
+
+void Material::removeTag(const QString& tag)
+{
+    _tags.remove(tag);
+}
+
 void Material::addPhysical(const QString& uuid)
 {
     if (hasPhysicalModel(uuid)) {
@@ -1327,6 +1340,12 @@ void Material::saveGeneral(QTextStream& stream) const
     if (!_reference.isEmpty()) {
         stream << "  ReferenceSource: \"" << MaterialValue::escapeString(_reference) << "\"\n";
     }
+    if (!_tags.isEmpty()) {
+        stream << "  Tags:\n";
+        for (auto tag : _tags) {
+            stream << "    - \"" << tag << "\"\n";
+        }
+    }
 }
 
 void Material::saveInherits(QTextStream& stream) const
diff --git a/src/Mod/Material/App/Materials.h b/src/Mod/Material/App/Materials.h
index 31cac1986f..e83c37f070 100644
--- a/src/Mod/Material/App/Materials.h
+++ b/src/Mod/Material/App/Materials.h
@@ -282,13 +282,11 @@ public:
     {
         _editState = ModelEdit_None;
     }
-    void addTag(const QString& tag)
+    void addTag(const QString& tag);
+    void removeTag(const QString& tag);
+    bool hasTag(const QString& tag)
     {
-        Q_UNUSED(tag);
-    }
-    void removeTag(const QString& tag)
-    {
-        Q_UNUSED(tag);
+        return _tags.contains(tag);
     }
     void addPhysical(const QString& uuid);
     void removePhysical(const QString& uuid);