diff --git a/debian/copyright b/debian/copyright
index cf2a8d8b0..a1a39ba1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -61,6 +61,8 @@ License: GPL-2+
 
 Files: static/themes/default/icons/ejabberd.png
        static/themes/default/icons/ejabberd.svg
+       static/themes/default/icons/email.png
+       static/themes/default/icons/email.svg
        static/themes/default/icons/matrixsynapse.svg
        static/themes/default/icons/privoxy.png
        static/themes/default/icons/privoxy.svg
diff --git a/plinth/modules/email/__init__.py b/plinth/modules/email/__init__.py
index 9627cbc3e..298046d54 100644
--- a/plinth/modules/email/__init__.py
+++ b/plinth/modules/email/__init__.py
@@ -51,7 +51,7 @@ class EmailApp(plinth.app.App):
 
         info = plinth.app.Info(app_id=self.app_id, version=self._version,
                                name=_('Postfix/Dovecot'),
-                               icon_filename='roundcube',
+                               icon_filename='email',
                                short_description=_('Email Server'),
                                description=_description, manual_page='Email',
                                clients=manifest.clients,
diff --git a/static/themes/default/icons/email.png b/static/themes/default/icons/email.png
new file mode 100644
index 000000000..dcfb177cc
Binary files /dev/null and b/static/themes/default/icons/email.png differ
diff --git a/static/themes/default/icons/email.svg b/static/themes/default/icons/email.svg
new file mode 100644
index 000000000..1ace77746
--- /dev/null
+++ b/static/themes/default/icons/email.svg
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="512"
+   height="512"
+   version="1.1"
+   id="svg71"
+   sodipodi:docname="Internet-mail.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview73"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.25455729"
+     inkscape:cx="-718.89514"
+     inkscape:cy="-544.08184"
+     inkscape:window-width="1852"
+     inkscape:window-height="1016"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg71" />
+  <defs
+     id="defs43">
+    <linearGradient
+       id="a">
+      <stop
+         offset="0"
+         stop-color="#9aa29a"
+         id="stop2" />
+      <stop
+         offset="1"
+         stop-color="#b5beb5"
+         id="stop4" />
+    </linearGradient>
+    <radialGradient
+       id="b"
+       cx="6.7030001"
+       cy="73.615997"
+       r="7.2280002"
+       gradientTransform="matrix(3.4251013,0,0,1.0381524,2.0723312,-20.765398)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop7" />
+      <stop
+         offset="1"
+         stop-opacity="0"
+         id="stop9" />
+    </radialGradient>
+    <linearGradient
+       id="i"
+       x1="8.7799997"
+       x2="9.7620001"
+       y1="37.785"
+       y2="32.202999"
+       gradientTransform="matrix(2.3949,0,0,0.78106,2.88,0.343)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-opacity=".129"
+         id="stop12" />
+      <stop
+         offset="1"
+         stop-opacity="0"
+         id="stop14" />
+    </linearGradient>
+    <linearGradient
+       id="h"
+       x1="11.233"
+       x2="21.112"
+       y1="13.686"
+       y2="24.132999"
+       gradientTransform="matrix(1.3709,0,0,1.4438,2.431,-0.14)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         id="stop17" />
+      <stop
+         offset="1"
+         stop-color="#ededed"
+         id="stop19" />
+    </linearGradient>
+    <linearGradient
+       id="g"
+       x1="8.9160004"
+       x2="9.8859997"
+       y1="37.196999"
+       y2="52.091"
+       gradientTransform="matrix(2.4548,0,0,0.762,2.88,0.343)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#a" />
+    <linearGradient
+       id="f"
+       x1="10.184"
+       x2="15.311"
+       y1="15.148"
+       y2="29.569"
+       gradientTransform="matrix(1.8193,0,0,1.0282,2.88,0.343)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         id="stop23" />
+      <stop
+         offset="1"
+         stop-color="#dcdcdc"
+         id="stop25" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       x1="5.8270001"
+       x2="13.467"
+       y1="7.2309999"
+       y2="17.877001"
+       gradientTransform="matrix(1.5706,0,0,1.191,2.88,0.343)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#ededed"
+         id="stop28" />
+      <stop
+         offset="1"
+         stop-color="#c8c8c8"
+         id="stop30" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       x1="11.573"
+       x2="18.475"
+       y1="4.7459998"
+       y2="26.023001"
+       gradientTransform="matrix(1.3435,0,0,1.4179,2.88,0.315)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#fff"
+         id="stop33" />
+      <stop
+         offset="1"
+         stop-color="#e2e2e2"
+         id="stop35" />
+    </linearGradient>
+    <linearGradient
+       id="d"
+       x1="2.062"
+       x2="30.6"
+       y1="15.257"
+       y2="15.257"
+       gradientTransform="matrix(1.3435,0,0,1.4179,2.88,0.315)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#989690"
+         id="stop38" />
+      <stop
+         offset="1"
+         stop-color="#656460"
+         id="stop40" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#a"
+       id="linearGradient90"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.4548,0,0,0.762,2.88,0.343)"
+       x1="8.9160004"
+       y1="37.196999"
+       x2="9.8859997"
+       y2="52.091" />
+  </defs>
+  <g
+     id="g197"
+     transform="matrix(12.823403,0,0,12.823403,-62.27045,-23.451719)">
+    <path
+       fill="url(#c)"
+       fill-rule="evenodd"
+       stroke="url(#d)"
+       stroke-linejoin="round"
+       stroke-width="0.857"
+       d="m 6.333,16.972 v 24.51 H 43.306 L 43.244,17.09 C 43.241,15.712 31.396,2.412 29.211,2.412 H 20.66 c -2.297,0 -14.326,13.262 -14.326,14.56 z"
+       id="path47"
+       style="fill:url(#c);stroke:url(#d)" />
+    <path
+       fill="url(#e)"
+       fill-rule="evenodd"
+       d="M 6.923,16.787 C 6.525,16.357 18.81,3.093 20.667,3.093 h 8.376 c 1.747,0 14.037,13.128 13.427,13.886 L 31.61,30.474 19.295,30.156 6.923,16.786 Z"
+       id="path49"
+       style="fill:url(#e)" />
+    <path
+       fill-opacity="0.146"
+       fill-rule="evenodd"
+       d="m 19.078,30.018 -7.333,-8.746 24.818,-6.936 3.029,6.216 -7.416,9.44"
+       id="path51" />
+    <path
+       fill-opacity="0.146"
+       fill-rule="evenodd"
+       d="m 18.292,29.836 -7.483,-8.81 24.648,-6.893 3.174,6.271 -7.241,9.407"
+       id="path53" />
+    <path
+       fill-opacity="0.146"
+       fill-rule="evenodd"
+       d="m 18.775,29.957 -7.675,-8.66 24.968,-7.065 3.286,6.593 -7.48,9.107"
+       id="path55" />
+    <path
+       fill="url(#f)"
+       fill-rule="evenodd"
+       d="m 18.594,30.441 -7.333,-8.746 24.712,-6.894 3.11,6.388 -7.12,8.986"
+       id="path57"
+       style="fill:url(#f)" />
+    <path
+       fill="url(#g)"
+       fill-rule="evenodd"
+       d="M 20.488,29.064 7.092,40.036 21.001,30.432 h 9.018 l 12.42,9.482 -11.864,-10.85 z"
+       id="path59"
+       style="fill:url(#linearGradient90)" />
+    <path
+       fill="url(#g)"
+       fill-rule="evenodd"
+       d="M 6.963,16.885 18.48,31.201 19.548,30.347 6.964,16.885 Z"
+       color="#000000"
+       id="path61"
+       style="fill:url(#g)" />
+    <path
+       fill="none"
+       stroke="url(#h)"
+       stroke-width="0.857"
+       d="m 7.308,17.131 0.03,23.211 H 42.284 L 42.221,17.258 C 42.219,16.508 31.005,3.459 28.837,3.459 h -7.895 c -2.253,0 -13.635,12.892 -13.634,13.672 z"
+       id="path63"
+       style="stroke:url(#h)" />
+    <path
+       fill="#ffffff"
+       fill-rule="evenodd"
+       d="m 20.957,30.453 -11.941,8.271 2.219,0.006 9.998,-6.869 8.822,-1.423 z m -9.529,-8.783 1.324,1.411 22.791,-6.884 2.915,5.682 0.614,-0.712 -3.069,-6.378 z"
+       id="path65" />
+    <path
+       fill="url(#i)"
+       fill-rule="evenodd"
+       d="m 13.308,23.636 6.026,6.454 1.197,-1.026 10.087,0.043 0.812,0.727 3.975,-4.744 C 34.251,23.679 13.308,23.636 13.308,23.636 Z"
+       id="path67"
+       style="fill:url(#i)" />
+    <path
+       fill="#b1b1b1"
+       fill-rule="evenodd"
+       d="M 41.813,17.848 31.861,30.479 30.793,29.624 Z"
+       color="#000000"
+       id="path69" />
+  </g>
+</svg>