diff --git a/root-fontconfig.patch b/root-fontconfig.patch
index e19c4b4..a8d8a30 100644
--- a/root-fontconfig.patch
+++ b/root-fontconfig.patch
@@ -61,7 +61,7 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
 -   if (fn.Last('/') == 0) fn = fn(1, fn.Length() - 1);
 +   const char *basename = gSystem->BaseName(fn);
 +
-+   char *ttfnt = NULL;
++   char *ttfnt = nullptr;
 +   int ttindex = 0;
 +
 +   FcPattern *pat, *match;
@@ -136,7 +136,7 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +   }
 +   else if (strcmp(basename, "symbol.ttf") == 0) {
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +   }
@@ -163,9 +163,9 @@ diff -ur root-6.28.00.orig/graf2d/asimage/src/TASImage.cxx root-6.28.00/graf2d/a
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +   }
 +
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
++   match = FcFontMatch (nullptr, pat, &result);
 +   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
  
@@ -255,7 +255,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 +   // Add root's font directory
 +   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 +                                       TROOT::GetTTFFontDir());
-+   FcConfigAppFontAddDir (NULL, (const FcChar8*)ttpath);
++   FcConfigAppFontAddDir (nullptr, (const FcChar8*)ttpath);
 +
     // load default font (arialbd)
     SetTextFont(62);
@@ -468,7 +468,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -   const char *ttpath = gEnv->GetValue("Root.TTFontPath",
 -                                       TROOT::GetTTFFontDir());
 -   char *ttfont = gSystem->Which(ttpath, fontname, kReadPermission);
-+   char *ttfont = NULL;
++   char *ttfont = nullptr;
 +   int ttindex = 0;
  
 -   if (!ttfont) {
@@ -481,7 +481,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -         return 1;
 -      }
 +   FcPattern *pat, *match;
-+   FcCharSet *set = NULL;
++   FcCharSet *set = nullptr;
 +   FcResult result;
 +
 +   pat = FcPatternCreate ();
@@ -544,7 +544,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 +      break;
 +   case 12:
 +   case 15:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
@@ -643,9 +643,9 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 +      break;
     }
  
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
++   match = FcFontMatch (nullptr, pat, &result);
 +   char *ttfnt;
 +   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +   ttfont = StrDup (ttfnt);
@@ -776,7 +776,7 @@ diff -ur root-6.28.00.orig/graf2d/graf/src/TTF.cxx root-6.28.00/graf2d/graf/src/
 -         // try backup free font
 -         thisset = 1;
 -      }
-+      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, NULL );
++      FT_Set_Transform( fgFace[fgCurFontIdx], &slantMat, nullptr );
     }
 -   Int_t italic = 0;
 -   if (fontid==15) italic = 1;
@@ -860,10 +860,10 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 -                                               fonttable[fontid][0], fonttable[fontid][1]);
 -         char *ttfont = gSystem->Which(ttpath, filename, kReadPermission);
 +
-+         char *ttfont = NULL;
++         char *ttfont = nullptr;
 +
 +         FcPattern *pat, *match;
-+         FcCharSet *set = NULL;
++         FcCharSet *set = nullptr;
 +         FcResult result;
 +
 +         pat = FcPatternCreate ();
@@ -925,7 +925,7 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 +            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +            break;
 +         case 12:
-+            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++            FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +            FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +            FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +            break;
@@ -1015,9 +1015,9 @@ diff -ur root-6.28.00.orig/graf2d/postscript/src/TPostScript.cxx root-6.28.00/gr
 +            break;
 +         }
 +
-+         FcConfigSubstitute (NULL, pat, FcMatchPattern);
++         FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +         FcDefaultSubstitute (pat);
-+         match = FcFontMatch (NULL, pat, &result);
++         match = FcFontMatch (nullptr, pat, &result);
 +         char *ttfnt;
 +         FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +         ttfont = StrDup(ttfnt);
@@ -1104,11 +1104,11 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
 -                                   ((TObjString*)fgFontFileArray[fileID])->String());
 -         file = fp;
 -         delete [] fp;
-+      char *file = NULL;
++      char *file = nullptr;
 +      int ttindex = 0;
 +
 +      FcPattern *pat, *match;
-+      FcCharSet *set = NULL;
++      FcCharSet *set = nullptr;
 +      FcResult result;
 +
 +      pat = FcPatternCreate ();
@@ -1171,7 +1171,7 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
 +         break;
 +      case 11:
 +      case 14:
-+         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++         FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +         FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +         FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +         break;
@@ -1262,9 +1262,9 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLFontManager.cxx root-6.28.00/graf3d/
 +         FcPatternAddCharSet (pat, FC_CHARSET, set);
        }
  
-+      FcConfigSubstitute (NULL, pat, FcMatchPattern);
++      FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +      FcDefaultSubstitute (pat);
-+      match = FcFontMatch (NULL, pat, &result);
++      match = FcFontMatch (nullptr, pat, &result);
 +      char *ttfnt;
 +      FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfnt);
 +      file = StrDup (ttfnt);
@@ -1431,7 +1431,7 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ITALIC);
 +      break;
 +   case 12:
-+      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"symbol");
++      FcPatternAddString (pat, FC_FAMILY, (const FcChar8*)"standardsymbolsps");
 +      FcPatternAddInteger (pat, FC_WEIGHT, FC_WEIGHT_REGULAR);
 +      FcPatternAddInteger (pat, FC_SLANT, FC_SLANT_ROMAN);
 +      break;
@@ -1447,9 +1447,9 @@ diff -ur root-6.28.00.orig/graf3d/gl/src/TGLText.cxx root-6.28.00/graf3d/gl/src/
 +      break;
 +   }
 +
-+   FcConfigSubstitute (NULL, pat, FcMatchPattern);
++   FcConfigSubstitute (nullptr, pat, FcMatchPattern);
 +   FcDefaultSubstitute (pat);
-+   match = FcFontMatch (NULL, pat, &result);
++   match = FcFontMatch (nullptr, pat, &result);
 +   FcPatternGetString (match, FC_FILE, 0, (FcChar8**)&ttfont);
 +   FcPatternGetInteger (match, FC_INDEX, 0, &ttindex);
  
diff --git a/root.spec b/root.spec
index c9a6ed3..74ba73f 100644
--- a/root.spec
+++ b/root.spec
@@ -47,7 +47,7 @@
 Name:		root
 Version:	6.30.02
 %global libversion %(cut -d. -f 1-2 <<< %{version})
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Numerical data analysis framework
 
 License:	LGPL-2.1-or-later
@@ -2554,6 +2554,10 @@ popd
 #
 # - test-webgui-ping
 #   error: Cannot display window in native
+#
+# - gtest-core-metacling-test-TClingLoadUnloadFile
+#   random failures
+#   terminate called after throwing an instance of 'std::bad_alloc'
 excluded="\
 test-stressIOPlugins|\
 tutorial-dataframe-df101_h1Analysis|\
@@ -2590,7 +2594,8 @@ tutorial-tmva-RBatchGenerator_NumPy-py|\
 test-import-numba|\
 tutorial-pyroot-pyroot004_NumbaDeclare-py|\
 pyunittests-pyroot-numbadeclare|\
-test-webgui-ping"
+test-webgui-ping|\
+gtest-core-metacling-test-TClingLoadUnloadFile"
 
 %if ! ( %{?fedora}%{!?fedora:0} || %{?rhel}%{!?rhel:0} == 8 )
 # - test-import-pandas
@@ -3723,6 +3728,10 @@ fi
 %endif
 
 %changelog
+* Mon Dec 18 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-3
+- Use "standardsymbolsps" instead of "symbol" when searching for the
+  Symbols font in order to not find Noto Symbols instead
+
 * Fri Dec 15 2023 Mattias Ellert <mattias.ellert@physics.uu.se> - 6.30.02-2
 - Exclude pyunittests-pyroot-numbadeclare test