diff --git a/process-official-tarball b/process-official-tarball
index 0ec4b47..c3f4077 100755
--- a/process-official-tarball
+++ b/process-official-tarball
@@ -20,6 +20,9 @@ rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS
 rm -vf ./process-tarball-dir/*/comm/third_party/rust/idna/tests/IdnaTestV2.txt
 rm -vr ./process-tarball-dir/*/comm/third_party/rust/wast/tests/parse-fail/confusing*
 
+# We uses system freetype2
+rm -vrf ./process-tarball-dir/*/modules/freetype2
+
 processed_tarball=${1/source/processed-source}
 
 cd ./process-tarball-dir
diff --git a/thunderbird.spec b/thunderbird.spec
index 87b6053..b42ade8 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -380,7 +380,6 @@ Provides: bundled(fathom)
 Provides: bundled(fdlibm)
 Provides: bundled(ffvpx)
 Provides: bundled(fluent.migratetb)
-Provides: bundled(freetype2)
 Provides: bundled(function2)
 Provides: bundled(gbm)
 Provides: bundled(gemmology)
@@ -1555,7 +1554,13 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
 # Register as an application to be visible in the software center
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
 %{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml
+%if 0%{?flatpak}
+# don't specify icon for flatpak appdata, icons are correctly named and packaged already
+# as org.mozilla.Thunderbird.png
+sed -i -e 's|<icon .*||' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
+%else
 sed -i -e 's|<icon .*|<icon type="stock">thunderbird</icon>|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
+%endif
 
 # Clean the created bundled rpms.
 rm -rf %{_srcrpmdir}/libffi*.src.rpm