diff --git a/assets/img/tools/Joplin.png b/assets/img/tools/Joplin.png
new file mode 100644
index 00000000..bcf2465c
Binary files /dev/null and b/assets/img/tools/Joplin.png differ
diff --git a/assets/img/tools/Laverna.png b/assets/img/tools/Laverna.png
deleted file mode 100644
index 15827eee..00000000
Binary files a/assets/img/tools/Laverna.png and /dev/null differ
diff --git a/index.html b/index.html
index a766fbe7..6cefb60e 100644
--- a/index.html
+++ b/index.html
@@ -1802,11 +1802,11 @@ layout: default
 <div class="row mb-2">
 
     {% include card.html color="success"
-    title="Laverna"
-    image="assets/img/tools/Laverna.png"
-    url="https://laverna.cc/"
-    footer="OS: Windows, macOS, Linux, Web."
-    description="Laverna is a JavaScript note-taking web application with a Markdown editor and encryption support. The application stores all your notes in your browser databases, which is good for security and privacy reasons, because only you have access."
+    title="Joplin"
+    image="assets/img/tools/Joplin.png"
+    url="https://joplin.cozic.net/"
+    footer="OS: Windows, macOS, Linux, iOS, Android, Firefox/Chrome (Web Clipper)."
+    description="Joplin is a free, open source, fully featured note taking and to-do application, which can handle a large number of markdown notes organised into notebooks and tags. It offers E2EE encryption and can sync through Nextcloud, Dropbox and more. It also offers easy import from Evernote and plain text notes."
     %}
 
     {% include card.html color="primary"
@@ -1828,6 +1828,11 @@ layout: default
 
 </div>
 
+<h3>Warning</h3>
+<ul>
+<li>Note: As of Dec 2018, Joplin does not support password/pin protection for the application itself or individual notes/notebooks. Data is still encrypted in transit and at sync location using your master key. See <a href='https://github.com/laurent22/joplin/issues/289'>open issue</a>.</li>
+</ul>
+
 <h3>Worth Mentioning</h3>
 <ul>
     <li><a href="http://paperwork.rocks/">Paperwork</a> - Open source and self-hosted solution. For PHP / MySQL servers.</li>