diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e5fcde1a6..e0473081e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -484,7 +484,7 @@ if( UNIX )
     set( UNIX_MIME_DIR resources/linux/mime )
     set( UNIX_MIMELNK_FILES ${UNIX_MIME_DIR}/mimelnk )
     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
-    set( UNIX_ICONS_FILES ${UNIX_MIME_DIR}/icons )
+    set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
 
     # Install Mimelnk directory
@@ -494,7 +494,7 @@ if( UNIX )
         )
 
     # Install Mime directory
-    install( DIRECTORY ${UNIX_ICONS_FILES}
+    install( DIRECTORY ${UNIX_ICON_FILES}
         DESTINATION ${CMAKE_INSTALL_PREFIX}/share
         COMPONENT resources
         )
diff --git a/resources/linux/mime/applications/eeschema.desktop b/resources/linux/mime/applications/eeschema.desktop
index 888598c5a6..0efd102ff5 100644
--- a/resources/linux/mime/applications/eeschema.desktop
+++ b/resources/linux/mime/applications/eeschema.desktop
@@ -2,7 +2,7 @@
 Categories=Development;Electronics
 Comment=Design an electronic schematic
 Comment[fr]=Dessiner des schémas électroniques
-Exec=eeschema
+Exec=eeschema %f
 GenericName=Electronic schematic design
 GenericName[fr]=Saisie de schéma électronique
 Icon=eeschema
diff --git a/resources/linux/mime/applications/kicad.desktop b/resources/linux/mime/applications/kicad.desktop
index 1d7645ba72..bf813160f7 100644
--- a/resources/linux/mime/applications/kicad.desktop
+++ b/resources/linux/mime/applications/kicad.desktop
@@ -2,7 +2,7 @@
 Categories=Development;Electronics
 Comment=Design a printed circuit board
 Comment[fr]=Concevoir un circuit imprimé
-Exec=kicad
+Exec=kicad %f
 GenericName=EDA Suite
 GenericName[fr]=Suite logicielle de conception électronique
 Icon=kicad
diff --git a/resources/linux/mime/applications/pcbnew.desktop b/resources/linux/mime/applications/pcbnew.desktop
index f1052326a6..57551ab8e5 100644
--- a/resources/linux/mime/applications/pcbnew.desktop
+++ b/resources/linux/mime/applications/pcbnew.desktop
@@ -2,10 +2,10 @@
 [Desktop Entry]
 Categories=Development;Electronics
 Comment=Design a printed circuit board
-Exec=pcbnew
+Exec=pcbnew %f
 GenericName=EDA Suite
 Icon=pcbnew
-MimeType=application/x-pcbnew-project;
+MimeType=application/x-pcbnew-pcb;
 Name=pcbnew
 Type=Application
 Name[en_US]=pcbnew
diff --git a/resources/linux/mime/mimelnk/application/x-kicad-pcb.desktop b/resources/linux/mime/mimelnk/application/x-kicad-pcb.desktop
new file mode 100644
index 0000000000..7a5afb8b80
--- /dev/null
+++ b/resources/linux/mime/mimelnk/application/x-kicad-pcb.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-kicad-pcb
+Icon=pcbnew
+Patterns=*.kicad_pcb
+
+Comment=KiCad Printed Circuit Board
+#Comment[fr]=Schéma électronique KiCad