diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 8823048cb..2a4072d16 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -18,7 +18,6 @@
     <screenshot>https://raw.githubusercontent.com/pierre-alain-b/snappymail-nextcloud/master/screenshots/2016.10.20-screenshot.jpg</screenshot>
 	<website>https://github.com/pierre-alain-b/snappymail-nextcloud</website>
 	<bugs>https://github.com/pierre-alain-b/snappymail-nextcloud/issues</bugs>
-	<screenshot>https://raw.githubusercontent.com/pierre-alain-b/snappymail-nextcloud/master/screenshots/2016.10.20-screenshot.jpg</screenshot>
 	<dependencies>
     <php min-version="7.4" />
 		<owncloud min-version="6" max-version="9.2" />
diff --git a/integrations/nextcloud/snappymail/img/favicon.png b/integrations/nextcloud/snappymail/img/favicon.png
index ce1dd1a88..78ab30b38 100644
Binary files a/integrations/nextcloud/snappymail/img/favicon.png and b/integrations/nextcloud/snappymail/img/favicon.png differ
diff --git a/integrations/nextcloud/snappymail/img/logo-64x64.png b/integrations/nextcloud/snappymail/img/logo-64x64.png
old mode 100755
new mode 100644
index ce1dd1a88..78ab30b38
Binary files a/integrations/nextcloud/snappymail/img/logo-64x64.png and b/integrations/nextcloud/snappymail/img/logo-64x64.png differ
diff --git a/integrations/nextcloud/snappymail/img/rainloop.svg b/integrations/nextcloud/snappymail/img/rainloop.svg
deleted file mode 100644
index 645a728ff..000000000
--- a/integrations/nextcloud/snappymail/img/rainloop.svg
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg833"
-   width="32"
-   height="32"
-   viewBox="0 0 32 32"
-   sodipodi:docname="rainloop.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata839">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs837" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1001"
-     id="namedview835"
-     showgrid="false"
-     inkscape:pagecheckerboard="false"
-     inkscape:zoom="22.627417"
-     inkscape:cx="19.245844"
-     inkscape:cy="14.4084"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g841"
-     inkscape:lockguides="false"
-     inkscape:document-rotation="0" />
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Image"
-     id="g841">
-    <g
-       id="g1189"
-       transform="translate(-5e-7,-0.1334595)">
-      <g
-         id="g921"
-         transform="matrix(0.73266354,0.68059102,-0.71588328,0.69821997,-0.05840962,-0.42219604)">
-        <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50332;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
-           d="M 5.6496339,3.1617897 H 25.056799 v 0.03224 H 5.6496339 Z"
-           id="path923" />
-        <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50332;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
-           d="M 5.6503906,2.4101562 C 5.2350485,2.4100358 4.898317,2.7467673 4.8984375,3.1621094 v 0.03125 c -1.204e-4,0.4153421 0.336611,0.7520735 0.7519531,0.7519531 H 25.056641 c 0.415342,1.204e-4 0.752073,-0.336611 0.751953,-0.7519531 L 24.737581,-0.12374013 C 24.493696,2.1372587 24.241088,2.426127 22.836001,2.4101563 h -0.981297 -1.962593 -4.538595 z"
-           id="path925"
-           sodipodi:nodetypes="cccccccccccc" />
-      </g>
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.33469;stroke-opacity:1"
-         id="rect994-7"
-         width="15.036267"
-         height="0.032800458"
-         x="4.2540865"
-         y="-19.78083"
-         transform="matrix(-0.69218043,0.7217245,-0.73411036,-0.67903018,0,0)" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.31971;stroke-opacity:1"
-         id="rect994-7-4"
-         width="14.866495"
-         height="0.032434449"
-         x="26.006418"
-         y="3.4238737"
-         transform="matrix(0.69298606,0.72095099,0.73486654,-0.67821175,0,0)" />
-      <g
-         id="g921-4"
-         transform="matrix(-0.73266354,0.68059102,0.71588328,0.69821997,32.107971,-0.42219604)">
-        <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50332;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
-           d="M 5.6496339,3.1617897 H 25.056799 v 0.03224 H 5.6496339 Z"
-           id="path923-2" />
-        <path
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50332;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
-           d="M 5.6503906,2.4101562 C 5.2350485,2.4100358 4.898317,2.7467673 4.8984375,3.1621094 v 0.03125 c -1.204e-4,0.4153421 0.336611,0.7520735 0.7519531,0.7519531 H 25.056641 c 0.415342,1.204e-4 0.752073,-0.336611 0.751953,-0.7519531 L 24.737581,-0.12374013 C 24.493696,2.1372587 24.241088,2.426127 22.836001,2.4101563 h -0.981297 -1.962593 -4.538595 z"
-           id="path925-2"
-           sodipodi:nodetypes="cccccccccccc" />
-      </g>
-      <g
-         id="g1055"
-         transform="translate(-0.07570186)">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.0908;stroke-linejoin:round;stroke-opacity:1"
-           id="rect1343-5-0"
-           width="0.70920312"
-           height="0.0092054419"
-           x="-1.4234889"
-           y="4.4235983"
-           transform="scale(-1,1)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1"
-           width="1.9386948"
-           height="0.027632279"
-           x="5.3451033"
-           y="5.7705297"
-           transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1-1"
-           width="1.9386948"
-           height="0.027632279"
-           x="-7.0470266"
-           y="1.0897269"
-           transform="matrix(-2.0192883e-4,-0.99999998,0.79298683,0.60923877,0,0)" />
-      </g>
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-         id="rect845-4-2-1-8"
-         width="1.9386948"
-         height="0.027632279"
-         x="14.047385"
-         y="5.7727451"
-         transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-         id="rect845-4-2-1-88"
-         width="1.9386948"
-         height="0.027632279"
-         x="22.940956"
-         y="5.7750101"
-         transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-         id="rect845-4-2-1-8-6"
-         width="1.9386948"
-         height="0.027632279"
-         x="14.613998"
-         y="-1.0194745"
-         transform="matrix(2.0192883e-4,0.99999998,-0.79298683,-0.60923877,0,0)" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-         id="rect845-4-2-1-8-8"
-         width="1.9386948"
-         height="0.027632279"
-         x="-8.9796991"
-         y="-39.359989"
-         transform="matrix(2.0192883e-4,0.99999998,-0.79298683,-0.60923877,0,0)" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-         id="rect845-4-2-1-8-3"
-         width="1.9386948"
-         height="0.027632279"
-         x="31.91931"
-         y="34.90218"
-         transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-         id="rect845-4-2-1-8-64"
-         width="1.9386948"
-         height="0.027632279"
-         x="40.643787"
-         y="34.626904"
-         transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-      <g
-         id="g1055-7"
-         transform="rotate(180,16.037851,16.023434)">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.0908;stroke-linejoin:round;stroke-opacity:1"
-           id="rect1343-5-0-1"
-           width="0.70920312"
-           height="0.0092054419"
-           x="-1.4234889"
-           y="4.4235983"
-           transform="scale(-1,1)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1-5"
-           width="1.9386948"
-           height="0.027632279"
-           x="5.3451033"
-           y="5.7705297"
-           transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1-1-0"
-           width="1.9386948"
-           height="0.027632279"
-           x="-7.0470266"
-           y="1.0897269"
-           transform="matrix(-2.0192883e-4,-0.99999998,0.79298683,0.60923877,0,0)" />
-      </g>
-      <g
-         id="g1055-0"
-         transform="rotate(90,16.037852,19.747164)">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.0908;stroke-linejoin:round;stroke-opacity:1"
-           id="rect1343-5-0-4"
-           width="0.70920312"
-           height="0.0092054419"
-           x="-1.4234889"
-           y="4.4235983"
-           transform="scale(-1,1)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1-80"
-           width="1.9386948"
-           height="0.027632279"
-           x="5.3451033"
-           y="5.7705297"
-           transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1-1-5"
-           width="1.9386948"
-           height="0.027632279"
-           x="-7.0470266"
-           y="1.0897269"
-           transform="matrix(-2.0192883e-4,-0.99999998,0.79298683,0.60923877,0,0)" />
-      </g>
-      <g
-         id="g1055-5"
-         transform="rotate(-90,12.386296,16.171311)">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.0908;stroke-linejoin:round;stroke-opacity:1"
-           id="rect1343-5-0-0"
-           width="0.70920312"
-           height="0.0092054419"
-           x="-1.4234889"
-           y="4.4235983"
-           transform="scale(-1,1)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1-0"
-           width="1.9386948"
-           height="0.027632279"
-           x="5.3451033"
-           y="5.7705297"
-           transform="matrix(0.99999998,-2.0192883e-4,-0.60923877,0.79298683,0,0)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.75566;stroke-opacity:1"
-           id="rect845-4-2-1-1-1"
-           width="1.9386948"
-           height="0.027632279"
-           x="-7.0470266"
-           y="1.0897269"
-           transform="matrix(-2.0192883e-4,-0.99999998,0.79298683,0.60923877,0,0)" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
index 6cfe12691..d1d81e6bd 100644
--- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
+++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
@@ -73,7 +73,7 @@ class Application extends App {
 				'id' => 'snappymail',
 				'order' => 10,
 				'href' => $urlGenerator->linkToRoute('snappymail.page.index'),
-				'icon' => $urlGenerator->imagePath('snappymail', 'snappymail.svg'),
+				'icon' => $urlGenerator->imagePath('snappymail', 'logo-64x64.png'),
 				'name' => \OCP\Util::getL10N('snappymail')->t('Email')
 			];
 		});
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a1.png b/integrations/nextcloud/snappymail/screenshots/help_a1.png
new file mode 100644
index 000000000..bec6cbed3
Binary files /dev/null and b/integrations/nextcloud/snappymail/screenshots/help_a1.png differ
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a2.png b/integrations/nextcloud/snappymail/screenshots/help_a2.png
new file mode 100644
index 000000000..0d7174f5d
Binary files /dev/null and b/integrations/nextcloud/snappymail/screenshots/help_a2.png differ
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a3.png b/integrations/nextcloud/snappymail/screenshots/help_a3.png
new file mode 100644
index 000000000..77415d815
Binary files /dev/null and b/integrations/nextcloud/snappymail/screenshots/help_a3.png differ
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a4.png b/integrations/nextcloud/snappymail/screenshots/help_a4.png
new file mode 100644
index 000000000..ff2e62d66
Binary files /dev/null and b/integrations/nextcloud/snappymail/screenshots/help_a4.png differ