diff --git a/debian/mime/application/x-qgis-composer-template.desktop.desktop b/debian/mime/application/x-qgis-composer-template.desktop.desktop
new file mode 100644
index 000000000000..624c2d4a2336
--- /dev/null
+++ b/debian/mime/application/x-qgis-composer-template.desktop.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-qgis-composer-template
+Hidden=false
+Comment=QGIS composer template
+Icon=qgis-mime
+Patterns=*.qpt;
+Name[en_US]=x-qgis-composer-template.desktop
diff --git a/debian/mime/application/x-qgis-layer-definition.desktop.desktop b/debian/mime/application/x-qgis-layer-definition.desktop.desktop
new file mode 100644
index 000000000000..f0f6cae89271
--- /dev/null
+++ b/debian/mime/application/x-qgis-layer-definition.desktop.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=application/x-qgis-layer-definition
+Hidden=false
+Comment=QGIS layer definition
+Icon=qgis-mime
+Patterns=*.qlr;
+Name[en_US]=x-qgis-layer-definition.desktop
diff --git a/debian/qgis-mime-icon128x128.png b/debian/qgis-mime-icon128x128.png
index 25754b98f4ed..1ab248e76fa3 100644
Binary files a/debian/qgis-mime-icon128x128.png and b/debian/qgis-mime-icon128x128.png differ
diff --git a/debian/qgis-mime-icon16x16.png b/debian/qgis-mime-icon16x16.png
index 0c4dac0a7098..abfd3db2ec45 100644
Binary files a/debian/qgis-mime-icon16x16.png and b/debian/qgis-mime-icon16x16.png differ
diff --git a/debian/qgis-mime-icon192x192.png b/debian/qgis-mime-icon192x192.png
new file mode 100644
index 000000000000..f636033f2cab
Binary files /dev/null and b/debian/qgis-mime-icon192x192.png differ
diff --git a/debian/qgis-mime-icon22x22.png b/debian/qgis-mime-icon22x22.png
index 1696bf8bb79d..fe2acf0596a7 100644
Binary files a/debian/qgis-mime-icon22x22.png and b/debian/qgis-mime-icon22x22.png differ
diff --git a/debian/qgis-mime-icon24x24.png b/debian/qgis-mime-icon24x24.png
index 4d9d26abe1b9..72d901665312 100644
Binary files a/debian/qgis-mime-icon24x24.png and b/debian/qgis-mime-icon24x24.png differ
diff --git a/debian/qgis-mime-icon256x256.png b/debian/qgis-mime-icon256x256.png
new file mode 100644
index 000000000000..a951c1f353f7
Binary files /dev/null and b/debian/qgis-mime-icon256x256.png differ
diff --git a/debian/qgis-mime-icon32x32.png b/debian/qgis-mime-icon32x32.png
index 3dd6de07cb1d..e75721d598e2 100644
Binary files a/debian/qgis-mime-icon32x32.png and b/debian/qgis-mime-icon32x32.png differ
diff --git a/debian/qgis-mime-icon36x36.png b/debian/qgis-mime-icon36x36.png
index e3a60a6f0e9a..02388d72ab0a 100644
Binary files a/debian/qgis-mime-icon36x36.png and b/debian/qgis-mime-icon36x36.png differ
diff --git a/debian/qgis-mime-icon42x42.png b/debian/qgis-mime-icon42x42.png
index 771fc71e79e9..3c2f23b8cf7a 100644
Binary files a/debian/qgis-mime-icon42x42.png and b/debian/qgis-mime-icon42x42.png differ
diff --git a/debian/qgis-mime-icon48x48.png b/debian/qgis-mime-icon48x48.png
index 55f773b2f69e..5a5749fdffc5 100644
Binary files a/debian/qgis-mime-icon48x48.png and b/debian/qgis-mime-icon48x48.png differ
diff --git a/debian/qgis-mime-icon512x512.png b/debian/qgis-mime-icon512x512.png
new file mode 100644
index 000000000000..d6a5abe42a45
Binary files /dev/null and b/debian/qgis-mime-icon512x512.png differ
diff --git a/debian/qgis-mime-icon64x64.png b/debian/qgis-mime-icon64x64.png
index f00b683a4254..2b2514f8ac85 100644
Binary files a/debian/qgis-mime-icon64x64.png and b/debian/qgis-mime-icon64x64.png differ
diff --git a/debian/qgis-mime-icon72x72.png b/debian/qgis-mime-icon72x72.png
index fe286e3971b7..ecf533e341e3 100644
Binary files a/debian/qgis-mime-icon72x72.png and b/debian/qgis-mime-icon72x72.png differ
diff --git a/debian/qgis-mime-icon80x80.png b/debian/qgis-mime-icon80x80.png
index bccc45180648..0928100c4d69 100644
Binary files a/debian/qgis-mime-icon80x80.png and b/debian/qgis-mime-icon80x80.png differ
diff --git a/debian/qgis-mime-icon8x8.png b/debian/qgis-mime-icon8x8.png
index 87351819ed19..647c4df37b33 100644
Binary files a/debian/qgis-mime-icon8x8.png and b/debian/qgis-mime-icon8x8.png differ
diff --git a/debian/qgis-mime-icon96x96.png b/debian/qgis-mime-icon96x96.png
index 2d0220570e71..0c939090160d 100644
Binary files a/debian/qgis-mime-icon96x96.png and b/debian/qgis-mime-icon96x96.png differ
diff --git a/debian/qgis.desktop b/debian/qgis.desktop
index 8a1d3ada5553..844cea552f0d 100644
--- a/debian/qgis.desktop
+++ b/debian/qgis.desktop
@@ -53,5 +53,5 @@ Exec=/usr/bin/qgis %F
 Terminal=false
 StartupNotify=false
 Categories=Qt;Education;Science;Geography;
-MimeType=application/x-qgis-project;image/tiff;image/jpeg;image/jp2;application/x-raster-aig;application/x-raster-ecw;application/x-raster-mrsid;application/x-mapinfo-mif;application/x-esri-shape;
+MimeType=application/x-qgis-project;application/x-qgis-layer-settings;application/x-qgis-layer-definition;application/x-qgis-composer-template;image/tiff;image/jpeg;image/jp2;application/x-raster-aig;application/x-raster-ecw;application/x-raster-mrsid;application/x-mapinfo-mif;application/x-esri-shape;
 Keywords=map;globe;postgis;wms;wfs;ogc;osgeo;
diff --git a/debian/qgis.mime b/debian/qgis.mime
index f4c3aeb605aa..bc345a9cbfdd 100644
--- a/debian/qgis.mime
+++ b/debian/qgis.mime
@@ -7,3 +7,6 @@ application/x-raster-mrsid; qgis '%s'; description="MrSID raster data"; test=tes
 application/x-raster-mif; qgis '%s'; description="MapInfo file"; test=test -n "$DISPLAY"; nametemplate=%s.mif; priority=2
 application/x-esri-shape; qgis '%s'; description="ESRI shape file"; test=test -n "$DISPLAY"; nametemplate=%s.shp; priority=2
 application/x-qgis-project; qgis '%s'; description="QGIS Project"; test=test -n "$DISPLAY"; nametemplate=%s.qgs
+application/x-qgis-layer-settings; qgis '%s'; description="QGIS Layer Settings"; test=test -n "$DISPLAY"; nametemplate=%s.qml
+application/x-qgis-layer-definition; qgis '%s'; description="QGIS Layer Definition"; test=test -n "$DISPLAY"; nametemplate=%s.qlr
+application/x-qgis-composer-template; qgis '%s'; description="QGIS Composer Template"; test=test -n "$DISPLAY"; nametemplate=%s.qpt
diff --git a/debian/qgis.xml b/debian/qgis.xml
index 6d43ef6a6c3d..514d30d85bee 100644
--- a/debian/qgis.xml
+++ b/debian/qgis.xml
@@ -6,7 +6,7 @@
     <comment xml:lang="de">QGIS-Projekt</comment>
     <sub-class-of type="application/xml"/>
     <alias type="application/x-qgis"/>
-    <icon name="qgis-mime"/>
+    <icon name="qgis-qgs"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis projectname"/>
@@ -19,7 +19,7 @@
     <comment>QGIS layer settings</comment>
     <comment xml:lang="de">QGIS Layer Einstellungen</comment>
     <sub-class-of type="application/xml"/>
-    <icon name="qgis-mime"/>
+    <icon name="qgis-qml"/>
     <magic priority="50">
       <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
         <match type="string" offset="0:256" value="&lt;qgis version"/>
@@ -27,6 +27,32 @@
     </magic>
     <glob pattern="*.qml"/>
   </mime-type>
+  
+  <mime-type type="application/x-qgis-layer-definition">
+    <comment>QGIS layer definition</comment>
+    <comment xml:lang="de">QGIS Layer definition</comment>
+    <sub-class-of type="application/xml"/>
+    <icon name="qgis-qlr"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis version"/>
+      </match>
+    </magic>
+    <glob pattern="*.qlr"/>
+  </mime-type>
+
+  <mime-type type="application/x-qgis-composer-template">
+    <comment>QGIS composer template</comment>
+    <comment xml:lang="de">QGIS Komponist Vorlage</comment>
+    <sub-class-of type="application/xml"/>
+    <icon name="qgis-qpt"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis version"/>
+      </match>
+    </magic>
+    <glob pattern="*.qpt"/>
+  </mime-type>
 
   <mime-type type="application/x-esri-shape">
     <comment>ESRI shape file</comment>
diff --git a/debian/rules b/debian/rules
index a64c252f90be..d2b421b58383 100755
--- a/debian/rules
+++ b/debian/rules
@@ -303,6 +303,14 @@ override_dh_auto_install:
 		install -o root -g root -m 644 $(CURDIR)/debian/qgis-mime-icon$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes/qgis-mime.png ; \
 	done
 
+	# Install QGIS file formats icons
+	for file_type in qgs qlr qml qpt; do \
+		for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
+			install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes ; \
+			install -o root -g root -m 644 $(CURDIR)/debian/qgis-$${file_type}-mime$${size}.png $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/mimetypes/qgis-qgs.png ; \
+		done
+	done
+
 	# Install application icon
 	for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do \
 		install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/icons/hicolor/$${size}/apps ; \
diff --git a/rpm/sources/qgis-mime.xml b/rpm/sources/qgis-mime.xml
index 32a431704af2..1d196977c882 100644
--- a/rpm/sources/qgis-mime.xml
+++ b/rpm/sources/qgis-mime.xml
@@ -25,4 +25,31 @@
     </magic>
     <glob pattern="*.qml"/>
   </mime-type>
+
+  <mime-type type="application/x-qgis-layer-definition">
+    <comment>QGIS layer definition</comment>
+    <comment xml:lang="de">QGIS Layer definition</comment>
+    <sub-class-of type="application/xml"/>
+    <icon name="qgis-qlr"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis version"/>
+      </match>
+    </magic>
+    <glob pattern="*.qlr"/>
+  </mime-type>
+
+  <mime-type type="application/x-qgis-composer-template">
+    <comment>QGIS composer template</comment>
+    <comment xml:lang="de">QGIS Komponist Vorlage</comment>
+    <sub-class-of type="application/xml"/>
+    <icon name="qgis-qpt"/>
+    <magic priority="50">
+      <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
+        <match type="string" offset="0:256" value="&lt;qgis version"/>
+      </match>
+    </magic>
+    <glob pattern="*.qpt"/>
+  </mime-type>
+
 </mime-info>