diff --git a/build.gradle b/build.gradle
index bdc6e96076d..d8c703fb539 100644
--- a/build.gradle
+++ b/build.gradle
@@ -618,7 +618,8 @@ jlink {
                     '--win-dir-chooser',
                     '--win-shortcut',
                     '--temp', "$buildDir/installer",
-                    '--resource-dir', "${projectDir}/buildres/windows"
+                    '--resource-dir', "${projectDir}/buildres/windows",
+                    '--file-associations', "${projectDir}/buildres/windows/bibtexAssociations.properties"
             ]
         }
 
@@ -635,7 +636,8 @@ jlink {
                     '--linux-rpm-license-type', 'MIT',
                     // '--license-file', "${projectDir}/LICENSE.md",
                     '--description', 'JabRef is an open source bibliography reference manager. The native file format used by JabRef is BibTeX, the standard LaTeX bibliography format.',
-                    '--linux-shortcut'
+                    '--linux-shortcut',
+                    '--file-associations', "${projectDir}/buildres/linux/bibtexAssociations.properties"
             ]
         }
 
@@ -645,7 +647,8 @@ jlink {
             ]
             installerOptions = [
                     '--vendor', 'JabRef',
-                    '--app-version', "${project.version}"
+                    '--app-version', "${project.version}",
+                    '--file-associations', "${projectDir}/buildres/mac/bibtexAssociations.properties"
             ]
         }
     }
diff --git a/buildres/linux/jabref-JabRef.desktop b/buildres/linux/JabRef.desktop
similarity index 80%
rename from buildres/linux/jabref-JabRef.desktop
rename to buildres/linux/JabRef.desktop
index 38d696ec584..24b4db36601 100644
--- a/buildres/linux/jabref-JabRef.desktop
+++ b/buildres/linux/JabRef.desktop
@@ -6,7 +6,7 @@ Exec=APPLICATION_LAUNCHER
 Icon=APPLICATION_ICON
 Terminal=false
 Type=Application
-MimeType=text/x-bibtex;
+DESKTOP_MIMES
 Categories=DEPLOY_BUNDLE_CATEGORY
 Keywords=bibtex;biblatex;latex;bibliography
-StartupWMClass=org-jabref-JabRefMain
\ No newline at end of file
+StartupWMClass=org-jabref-JabRefMain
diff --git a/buildres/linux/bibtexAssociations.properties b/buildres/linux/bibtexAssociations.properties
new file mode 100644
index 00000000000..e1f13f7c4b9
--- /dev/null
+++ b/buildres/linux/bibtexAssociations.properties
@@ -0,0 +1,4 @@
+extension=bib
+mime-type=text/x-bibtex
+description=BibTeX File
+icon=JabRef.png
diff --git a/buildres/mac/bibtexAssociations.properties b/buildres/mac/bibtexAssociations.properties
new file mode 100644
index 00000000000..9db815dbbb5
--- /dev/null
+++ b/buildres/mac/bibtexAssociations.properties
@@ -0,0 +1,4 @@
+extension=bib
+mime-type=text/x-bibtex
+description=BibTeX File
+icon=jabref.icns
diff --git a/buildres/windows/bibtexAssociations.properties b/buildres/windows/bibtexAssociations.properties
new file mode 100644
index 00000000000..4a2696426b4
--- /dev/null
+++ b/buildres/windows/bibtexAssociations.properties
@@ -0,0 +1,4 @@
+extension=bib
+mime-type=text/x-bibtex
+description=BibTeX File
+icon=JabRef.ico