diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt
index 59a1a88e..3aab6e2d 100644
--- a/avogadro/CMakeLists.txt
+++ b/avogadro/CMakeLists.txt
@@ -175,8 +175,20 @@ if(APPLE)
 elseif(UNIX)
   install(FILES "icons/org.openchemistry.Avogadro2.desktop" DESTINATION "${INSTALL_XDG_APPS_DIR}")
   install(FILES "icons/org.openchemistry.Avogadro2.metainfo.xml" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
-  install(FILES "icons/avogadro.png" DESTINATION "${INSTALL_XDG_ICON_DIR}"
+  install(FILES "icons/avogadro.png" DESTINATION "${INSTALL_XDG_ICON_DIR}/hicolor/32x32/apps"
     RENAME "org.openchemistry.Avogadro2.png")
+  install(FILES "icons/avogadro.png" DESTINATION "${INSTALL_XDG_ICON_DIR}/hicolor/16x16@2/apps"
+    RENAME "org.openchemistry.Avogadro2.png")
+  install(FILES "icons/avogadro2_64.png" DESTINATION "${INSTALL_XDG_ICON_DIR}/hicolor/64x64/apps"
+    RENAME "org.openchemistry.Avogadro2.png")
+  install(FILES "icons/avogadro2_64.png" DESTINATION "${INSTALL_XDG_ICON_DIR}/hicolor/32x32@2/apps"
+    RENAME "org.openchemistry.Avogadro2.png")
+  install(FILES "icons/avogadro2_128.png" DESTINATION "${INSTALL_XDG_ICON_DIR}/hicolor/128x128/apps"
+    RENAME "org.openchemistry.Avogadro2.png")
+  install(FILES "icons/avogadro2_256.png" DESTINATION "${INSTALL_XDG_ICON_DIR}/hicolor/256x256/apps"
+    RENAME "org.openchemistry.Avogadro2.png")
+  install(FILES "icons/avogadro2.svg" DESTINATION "${INSTALL_XDG_ICON_DIR}/hicolor/scalable/apps"
+    RENAME "org.openchemistry.Avogadro2.svg")
 elseif(WIN32)
   list(APPEND avogadro_srcs icons/avogadro.rc)
 endif()
diff --git a/avogadro/icons/avogadro2.svg b/avogadro/icons/avogadro2.svg
new file mode 100644
index 00000000..51737794
--- /dev/null
+++ b/avogadro/icons/avogadro2.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="432px" height="432px" viewBox="0 0 432 432" enable-background="new 0 0 432 432" xml:space="preserve">
+<g>
+	<g>
+		<path d="M346.387,362.836c1.738,5.211,2.828,9.337,3.26,12.374c0.434,3.045-0.146,5.319-1.738,6.851
+			c-1.598,1.514-4.42,2.453-8.471,2.814c-4.053,0.358-9.633,0.546-16.723,0.546c-7.383,0-13.137-0.108-17.266-0.329
+			c-4.123-0.217-7.279-0.648-9.447-1.301c-2.18-0.646-3.695-1.551-4.564-2.717c-0.869-1.151-1.594-2.678-2.17-4.553l-18.893-56.47
+			H164.823l-17.81,54.943c-0.581,2.032-1.342,3.728-2.276,5.102c-0.948,1.383-2.472,2.464-4.569,3.265
+			c-2.1,0.785-5.068,1.332-8.901,1.619c-3.839,0.294-8.875,0.44-15.096,0.44c-6.655,0-11.873-0.218-15.636-0.654
+			c-3.771-0.427-6.376-1.48-7.818-3.144c-1.447-1.67-1.953-4.02-1.521-7.064c0.435-3.041,1.521-7.082,3.257-12.16l86.658-249.323
+			c0.869-2.467,1.88-4.46,3.042-5.977c1.155-1.526,2.999-2.673,5.536-3.479c2.526-0.791,6.045-1.301,10.529-1.521
+			c4.487-0.217,10.426-0.323,17.815-0.323c8.535,0,15.342,0.106,20.414,0.323c5.066,0.22,9.014,0.731,11.836,1.521
+			c2.824,0.807,4.852,2.002,6.084,3.585c1.227,1.603,2.277,3.762,3.146,6.517L346.387,362.836z M217.381,156.724h-0.221
+			l-39.744,119.454h79.707L217.381,156.724z"/>
+	</g>
+</g>
+<path fill="#0094CC" d="M169.128,147.121"/>
+<g>
+	<path fill="#00BDEB" d="M249.289,276.178c2.031-1.731,4.064-3.467,6.092-5.234l-7.703-23.155c-0.746,0.674-1.479,1.347-2.23,2.021
+		c-10.297,9.236-20.566,18.045-30.682,26.369H249.289z"/>
+	<path fill="#00BDEB" d="M94.453,362.398l3.607-10.377c-12.732,4.635-22.047,5.404-26.641,1.52
+		c-16.592-14.031,34.415-83.211,113.935-154.527c79.511-71.313,157.425-117.762,174.019-103.726
+		c13.1,11.072-15.939,56.512-67.848,110.232l8.25,23.651c68.354-69.676,104.094-134.626,81.508-153.713
+		c-26.213-22.164-121.074,25.894-211.864,107.328C78.621,264.215,26.264,348.189,52.478,370.348
+		c7.704,6.512,21.365,6.92,39.074,2.242C92.108,369.836,93.062,366.465,94.453,362.398z"/>
+	<path fill="#00BDEB" d="M192.618,320.052h-27.795l-7.349,22.669C168.775,336.048,180.554,328.447,192.618,320.052z"/>
+</g>
+<g>
+	<path fill="#0094CC" d="M92.198,369.813c-8.302,2.315-15.767,3.546-22.18,3.546c-7.386,0-13.09-1.658-16.959-4.928
+		c-3.917-3.31-5.949-8.319-6.047-14.89C46.507,319.07,97.101,249.307,170.043,183.89C243.707,117.817,322.775,71.672,362.32,71.672
+		c7.385,0,13.09,1.658,16.957,4.928c3.918,3.312,5.955,8.322,6.049,14.896c0.42,28.373-33.795,80.651-86.578,134.736l1.463,4.2
+		c54.273-55.388,89.557-109.446,89.123-138.994c-0.117-7.784-2.629-13.805-7.471-17.896c-4.609-3.898-11.184-5.874-19.543-5.874
+		c-40.447,0-120.615,46.566-194.953,113.24C93.626,247.041,42.486,318.055,43.008,353.6c0.114,7.781,2.624,13.801,7.465,17.891
+		c4.613,3.896,11.187,5.874,19.545,5.874c0.003,0,0.003,0,0.003,0c6.202,0,13.343-1.106,21.246-3.198
+		C91.467,372.886,91.78,371.433,92.198,369.813z"/>
+	<path fill="#0094CC" d="M216.705,276.178c9.731-8.029,19.559-16.469,29.368-25.264c0.686-0.615,1.354-1.227,2.035-1.84
+		l-1.383-4.152c-1.109,1.003-2.205,2.006-3.324,3.009c-11.035,9.896-22.086,19.345-32.979,28.247H216.705z"/>
+	<path fill="#0094CC" d="M245.027,276.178h6.193c1.529-1.309,3.055-2.639,4.582-3.967l-1.367-4.111
+		C251.305,270.834,248.166,273.52,245.027,276.178z"/>
+	<path fill="#0094CC" d="M359.955,93.372c-2.334-1.974-5.645-2.975-9.84-2.975c-27.695,0-97.852,44.89-166.81,106.738
+		c-69.68,62.492-118.093,123.5-117.729,148.362c0.06,3.99,1.35,7.081,3.838,9.186c2.333,1.974,5.642,2.974,9.836,2.974
+		c4.849,0,11.024-1.404,18.244-4.007l1.654-4.767c-7.989,3.103-14.734,4.768-19.898,4.768c-3.222,0-5.661-0.682-7.25-2.026
+		c-1.586-1.342-2.376-3.366-2.42-6.186c-0.34-23.411,48.614-84.526,116.398-145.32c68.296-61.256,137.328-105.716,164.136-105.716
+		c3.223,0,5.662,0.682,7.254,2.028c1.586,1.342,2.379,3.364,2.42,6.184c0.256,17.519-27.096,56.156-69.285,99.97l1.484,4.261
+		c44.094-45.511,72.082-85.371,71.805-104.29C363.736,98.565,362.443,95.476,359.955,93.372z"/>
+	<path fill="#0094CC" d="M194.793,320.052h-6.968c-9.921,6.827-19.656,13.112-29.091,18.786l-1.836,5.66
+		C169.104,337.326,181.812,329.141,194.793,320.052z"/>
+</g>
+<path fill="#00BDEB" d="M185.595,275.525c0.272,0.223,0.541,0.433,0.81,0.652h36.71c-7.885-6.021-15.883-12.327-23.946-18.906
+	c-4.107-3.352-8.136-6.709-12.115-10.064l-7.701,23.15C181.423,272.083,183.493,273.809,185.595,275.525z"/>
+<path fill="#00BDEB" d="M270.375,320.052h-24.373c10.525,6.925,20.781,13.209,30.68,18.851L270.375,320.052z"/>
+<path fill="#00BDEB" d="M250.055,169.366C155.559,92.259,64.495,53.517,46.662,82.854c-13.71,22.533,19.841,78.692,78.971,138.477
+	l15.313-15.601c-49.839-48.416-79.701-90.502-71.308-104.3c11.295-18.567,87.53,21.131,170.285,88.655
+	c82.76,67.534,140.697,137.32,129.402,155.885c-3.592,5.904-13.77,5.896-28.617,0.994l5.549,15.916
+	c0.834,2.495,1.508,4.727,2.041,6.725c20.094,4.508,34.531,2.401,40.564-7.521C406.703,332.754,344.547,246.471,250.055,169.366z"/>
+<path fill="#0094CC" d="M220.668,276.178h6.59c-8.705-6.6-17.526-13.529-26.385-20.756c-4.43-3.615-8.733-7.205-12.965-10.777
+	l-1.358,4.082c3.909,3.299,7.84,6.574,11.792,9.799C205.82,264.627,213.277,270.513,220.668,276.178z"/>
+<path fill="#0094CC" d="M277.451,341.203l-1.979-5.913c-8.082-4.674-16.375-9.765-24.813-15.238h-7.471
+	C254.936,327.863,266.404,334.942,277.451,341.203z"/>
+<path fill="#0094CC" d="M184.039,276.178h6.359c-1.034-0.834-2.066-1.658-3.1-2.5c-2.39-1.951-4.748-3.912-7.095-5.873l-1.358,4.074
+	C180.57,273.313,182.292,274.748,184.039,276.178z"/>
+<path fill="#0094CC" d="M251.889,167.474c-72.039-58.783-143.5-96.766-182.056-96.766c-11.792,0-19.974,3.623-24.315,10.765
+	c-14.373,23.621,18.814,80.109,79.147,140.931l2.824-2.877C69.045,160.553,35.67,105.362,48.94,83.554
+	c3.564-5.866,10.594-8.839,20.893-8.839c37.11,0,109.253,38.523,179.524,95.862c93.604,76.378,155.672,161.669,138.359,190.126
+	c-3.566,5.861-10.59,8.835-20.881,8.835c-0.002,0-0.006,0-0.006,0c-5.617-0.001-12.053-0.897-19.148-2.596
+	c0.48,1.613,0.867,3.063,1.188,4.41c6.561,1.427,12.592,2.19,17.961,2.19c0,0,0.004,0,0.006,0c11.785,0,19.961-3.619,24.305-10.76
+	C409.762,332.174,348.596,246.384,251.889,167.474z"/>
+<path fill="#0094CC" d="M241.756,188.191c-67.594-55.154-133.705-93.675-160.772-93.675c-6.055,0-10.257,1.862-12.49,5.532
+	c-9.706,15.954,23.976,60.319,71.599,106.641l2.714-2.763c-51.548-50.067-78.007-90.096-70.89-101.797
+	c1.456-2.393,4.507-3.606,9.067-3.606c26.225,0,91.296,38.149,158.241,92.771c88.826,72.486,138.393,137.783,128.957,153.293
+	c-1.457,2.394-4.508,3.606-9.07,3.606c-5.063,0-11.582-1.435-19.27-4.119l1.631,4.673c6.936,2.247,12.898,3.453,17.639,3.453
+	c6.057,0,10.26-1.861,12.492-5.532C384.969,324.703,316.078,248.842,241.756,188.191z"/>
+<path fill="#00BDEB" d="M63.558,184.584c-8.66-17.291-1.668-38.327,15.62-46.99c17.291-8.666,38.33-1.668,46.993,15.617
+	c8.662,17.291,1.67,38.33-15.617,46.992C93.262,208.867,72.221,201.872,63.558,184.584z"/>
+<path fill="#00BDEB" d="M330.031,131.266c-18.125,12.936-43.295,8.728-56.227-9.396c-12.936-18.116-8.725-43.29,9.395-56.223
+	s43.295-8.722,56.225,9.399C352.355,93.165,348.146,118.339,330.031,131.266z"/>
+<g>
+	<path fill="#FFFFFF" d="M324.238,119.768h-32.82v-6.417l15.148-17.133c2.262-2.665,3.867-4.922,4.82-6.77
+		c0.955-1.847,1.43-3.542,1.43-5.088c0-2.016-0.502-3.629-1.514-4.838c-1.004-1.209-2.518-1.814-4.533-1.814
+		c-2.127,0-3.773,0.774-4.939,2.32c-1.164,1.543-1.746,3.504-1.746,5.878h-9.541l-0.066-0.204
+		c-0.111-4.344,1.322-8.022,4.299-11.035c2.979-3.012,6.977-4.518,11.994-4.518s8.912,1.282,11.689,3.847
+		c2.775,2.564,4.166,6.006,4.166,10.328c0,2.937-0.779,5.612-2.336,8.03c-1.557,2.418-4.238,5.767-8.047,10.045l-8.063,9.673
+		l0.072,0.168h19.986V119.768z"/>
+</g>
+<g>
+	<path fill="#0094CC" d="M94.884,135.841c12.588,0,23.908,6.985,29.545,18.23c5.712,11.401,4.158,24.557-2.866,34.225l3.167,2.893
+		c8.291-10.896,9.814-25.868,3.279-38.914c-6.318-12.608-19.01-20.44-33.125-20.44c-5.677,0-11.146,1.291-16.269,3.807l2.024,3.48
+		C85.135,136.963,89.918,135.841,94.884,135.841z"/>
+	<path fill="#0094CC" d="M108.301,199.1c-4.148,1.801-8.826,2.78-13.354,2.78c-0.003,0-0.003,0-0.003,0
+		c-12.591,0-23.913-6.987-29.547-18.23c-5.802-11.588-4.175-24.994,3.143-34.702l-2.347-3.39c-8.91,10.954-11.1,26.462-4.376,39.886
+		c6.318,12.607,19.01,20.441,33.127,20.441c0,0,0,0,0.003,0c5.539,0,10.88-1.249,15.895-3.646L108.301,199.1z"/>
+</g>
+<g>
+	<path fill="#0094CC" d="M346.699,90.571l-3.607,0.608c0.857,4.435,1.018,9.23,0.252,13.82
+		c-1.688,10.092-7.201,18.921-15.527,24.864c-6.539,4.666-14.221,7.131-22.221,7.131c-10.955,0-21.74-4.801-28.961-12.87
+		l-3.086,2.043c7.996,9.345,19.625,14.832,32.047,14.832c8.84,0,17.328-2.723,24.547-7.876c9.197-6.563,15.287-16.316,17.15-27.463
+		C348.145,100.566,347.66,95.492,346.699,90.571z"/>
+	<path fill="#0094CC" d="M267.736,92.459c1.688-10.092,7.201-18.923,15.529-24.868c6.533-4.663,14.217-7.128,22.217-7.128
+		c12.219,0,23.738,5.875,30.934,15.712l4.127-1.069c-0.201-0.299-0.371-0.614-0.584-0.909c-7.926-11.109-20.813-17.74-34.477-17.74
+		c-8.84,0-17.326,2.722-24.541,7.874c-9.201,6.566-15.291,16.321-17.154,27.468c-1.109,6.638-0.604,13.285,1.342,19.527l3.545-2.172
+		C267.158,103.789,266.791,98.121,267.736,92.459z"/>
+</g>
+</svg>
diff --git a/cmake/InstallLocation.cmake b/cmake/InstallLocation.cmake
index ca9e375a..f23c0c19 100644
--- a/cmake/InstallLocation.cmake
+++ b/cmake/InstallLocation.cmake
@@ -33,7 +33,7 @@ if(UNIX AND NOT APPLE)
     set(INSTALL_XDG_APPS_DIR "${INSTALL_DATA_DIR}/applications")
   endif()
   if(NOT INSTALL_XDG_ICON_DIR)
-    set(INSTALL_XDG_ICON_DIR "${INSTALL_DATA_DIR}/pixmaps")
+    set(INSTALL_XDG_ICON_DIR "${INSTALL_DATA_DIR}/icons")
   endif()
 endif()