diff --git a/img/tools/0bin.png b/img/tools/0bin.png
deleted file mode 100644
index ff934ebe..00000000
Binary files a/img/tools/0bin.png and /dev/null differ
diff --git a/img/tools/ZeroBin.png b/img/tools/ZeroBin.png
new file mode 100644
index 00000000..bdaf8c63
Binary files /dev/null and b/img/tools/ZeroBin.png differ
diff --git a/index.html b/index.html
index 3f02a5e3..9de983a7 100644
--- a/index.html
+++ b/index.html
@@ -2581,36 +2581,39 @@
         <div class="col-sm-4">
           <div class="panel panel-success">
             <div class="panel-heading">
-              <h3 class="panel-title">Ghostbin</h3>
+              <h3 class="panel-title">PrivateBin</h3>
             </div>
             <div class="panel-body">
-              <p><img src="img/tools/Ghostbin.png" alt="Ghostbin" align="right" style="margin-left:5px;">Ghostbin supports encryption, expiration, sessions, grant users to edit your notes and pastes up to one megabyte. You can also create your own account to keep track of your pastes.</p>
+              <p><img src="img/tools/PrivateBin.png" alt="PrivateBin" align="right" style="margin-left:5px;">PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES. It is the improved version of ZeroBin.</p>
 
-              <p><a href="https://ghostbin.com/"><button type="button" class="btn btn-success">Website: ghostbin.com</button></a></p>
+              <p><a href="https://privatebin.net/"><button type="button" class="btn btn-success">Website: privatebin.net</button></a></p>
             </div>
           </div>
         </div><!-- /.col-sm-4 -->
         <div class="col-sm-4">
           <div class="panel panel-info">
             <div class="panel-heading">
-              <h3 class="panel-title">PrivateBin</h3>
+              <h3 class="panel-title">Zerobin.net</h3>
             </div>
             <div class="panel-body">
-              <p><img src="img/tools/PrivateBin.png" alt="PrivateBin" align="right" style="margin-left:5px;">PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES.</p>
+              <p><img src="img/tools/ZeroBin.png" alt="ZeroBin" align="right" style="margin-left:5px;">Zerobin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256bit AES.</p>
 
-              <p><a href="https://privatebin.info/"><button type="button" class="btn btn-info">Website: privatebin.info</button></a></p>
+              <p>
+		<a href="https://zerobin.net/"><button type="button" class="btn btn-info">Website: zerobin.net</button></a>
+		<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://zerobinqmdqd236y.onion. Requires specific software to access: torproject.org" href="http://zerobinqmdqd236y.onion"><img src="img/layout/tor.png" width="35"></img></a>
+	      </p>
             </div>
           </div>
         </div><!-- /.col-sm-4 -->
         <div class="col-sm-4">
           <div class="panel panel-warning">
             <div class="panel-heading">
-              <h3 class="panel-title">0bin</h3>
+              <h3 class="panel-title">Ghostbin</h3>
             </div>
             <div class="panel-body">
-              <p><img src="img/tools/0bin.png" alt="0bin" align="right" style="margin-left:5px;">0bin is a client side encrypted pastebin that can run without a database. 0bin allows anybody to host a pastebin while welcoming any type of content to be pasted in it.</p>
-
-              <p><a href="https://0bin.net/"><button type="button" class="btn btn-warning">Website: 0bin.net</button></a></p>
+              <p><img src="img/tools/Ghostbin.png" alt="Ghostbin" align="right" style="margin-left:5px;">Ghostbin supports encryption, expiration, sessions, grant users to edit your notes and pastes up to one megabyte. You can also create your own account to keep track of your pastes.</p>
+	      <p>The software is good but ghostbin.com's security is <a href="https://github.com/privacytoolsIO/privacytools.io/issues/454">worrisome</a>.</p>
+              <p><a href="https://ghostbin.com/"><button type="button" class="btn btn-warning">Website: ghostbin.com</button></a></p>
             </div>
           </div>
         </div><!-- /.col-sm-4 -->
@@ -2619,7 +2622,6 @@
   <h3>Worth Mentioning</h3>
   <ul>
 	  <li><a href="https://disroot.org/">disroot.org</a> - Free privacy friendly service that offers PrivateBin and other applications.</li>
-	  <li><a href="https://hastebin.com/">hastebin.com</a> - Haste is an open-source pastebin software written in node.js, which is easily installable in any network.</li>
   </ul>