diff --git a/about.html b/about.html
index 5452d0f91e474b1540c04487b33a50fc4301775a..ae179d1c9305191d0c3b9040df188858188360f6 100644
--- a/about.html
+++ b/about.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/apk.html b/apk.html
index 7a8a638e3cdbdd381bd12cf5d96be0837fbd3f4a..f79f430497bebf722dd4b57f86562f3a5a4cd0a5 100644
--- a/apk.html
+++ b/apk.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/building.html b/building.html
index 6c79ff94bc91a4cd0becc4d7b5f0e06f0232a40e..c201f92dcc06d86f7153039ec6dba4dcf78490e8 100644
--- a/building.html
+++ b/building.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/copyright.html b/copyright.html
index 8387acbe5f7cbc12487c44bfc993dad5ca0f0178..fc31e5792bb8f0c1afaac80332403aa207f3c0a2 100644
--- a/copyright.html
+++ b/copyright.html
@@ -18,6 +18,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/css/styles.css b/css/styles.css
index c64f286dc29f5462032fef9997eaf90a7a91f103..44dcba9d9ce3aae55739cc9ac72850cb06d35734 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -29,7 +29,13 @@ img {
     vertical-align:middle;
 }
 
-#playbutton {
+#twitterbutton {
+    width: 21px;
+    padding-left: 9px;
+    padding-top: 3px;
+}
+
+#playbutton, #fdroidbutton {
     width:240px;
 }
 
@@ -511,7 +517,7 @@ figcaption {
         margin-top:15px;
     }
 
-    #playbutton {
+    #playbutton, #fdroidbutton {
         width:200px;
     }
 
diff --git a/download.html b/download.html
index ea9d7a9b474167c320e040dd2a49d2dae094b15b..0d6fb67ca81bc656fd27b1a01edfaefc0785a00b 100644
--- a/download.html
+++ b/download.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -51,7 +52,10 @@
 
           <p>Briar for Android is currently in <a href="news/2017-beta-released-security-audit.html">public beta</a> and is available for download from Google Play.</p>
 
-          <p><a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.beta" target="_blank"><img id="playbutton" src="img/google_play_badge_web_generic.png" alt="Get it on Google Play" border="0"/></a></p>
+          <p>
+            <a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.beta" target="_blank"><img id="playbutton" src="img/google_play_badge_web_generic.png" alt="Get it on Google Play" border="0"/></a>
+            <a href="fdroid.html"><img id="fdroidbutton" src="img/fdroid_badge.png" alt="Get it on F-Droid" border="0"/></a>
+          </p>
 
           <p>If you prefer not to use Google Play, you can <a href="fdroid.html">install the app via F-Droid</a> or <a href="apk.html">download the APK file</a> directly from our site.</p>
 
diff --git a/fdroid.html b/fdroid.html
index 958b1eb83957a8c50a193abc260203c1f0fd8e0d..cbbb3322f6d9cc06b17c71a6fb3669b16d2b922c 100644
--- a/fdroid.html
+++ b/fdroid.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/get-involved.html b/get-involved.html
index 1b6ff04548cdeef3814ceb656c411c2ab5a8ebbd..34593f3ee3a09707fa9e3f1058112a35924c6bf3 100644
--- a/get-involved.html
+++ b/get-involved.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/hiring.html b/hiring.html
index 4c93402d06d74dffc6cf5ec317cf55c38030d75b..582e6489fba5e0c1aeccdbb4189b73802a04afb4 100644
--- a/hiring.html
+++ b/hiring.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/how-it-works.html b/how-it-works.html
index c0dc4dbf740029501e8f3e7596700de43610e9a6..872480e8d13fcd1b655fc41833437f5742490dc8 100644
--- a/how-it-works.html
+++ b/how-it-works.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/img/fdroid_badge.png b/img/fdroid_badge.png
new file mode 100644
index 0000000000000000000000000000000000000000..23af0e40896a27331cfb2485562e2dac3ab9cbef
Binary files /dev/null and b/img/fdroid_badge.png differ
diff --git a/img/twitter.png b/img/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..68b0968e8f3fb9f37e89b2b88b637d402173a562
Binary files /dev/null and b/img/twitter.png differ
diff --git a/index.html b/index.html
index 2f2f5acb43ede321114abba6bed463fd77c52b24..05c5deebeca88158ec72402793e6ee32e62133fd 100644
--- a/index.html
+++ b/index.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
@@ -64,6 +65,7 @@
           </ul>
 
           <a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.beta" target="_blank"><img id="playbutton" src="img/google_play_badge_web_generic.png" alt="Get it on Google Play" border="0"/></a>
+          <a href="fdroid.html"><img id="fdroidbutton" src="img/fdroid_badge.png" alt="Get it on F-Droid" border="0"/></a>
 
         </div> <!-- intro -->
 
diff --git a/news/2017-beta-released-security-audit.html b/news/2017-beta-released-security-audit.html
index 100c0e8f3dfebff6f0ccd586dc9a9f6a7499a066..d17e44159afb604d44a55e85445cc53de294fa6d 100644
--- a/news/2017-beta-released-security-audit.html
+++ b/news/2017-beta-released-security-audit.html
@@ -18,6 +18,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="../img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">
diff --git a/privacy.html b/privacy.html
index f3ae353d3b608dd5044a9b073671663757dc3104..c8e986a405fda53b335ba338fe680aa069b7e561 100644
--- a/privacy.html
+++ b/privacy.html
@@ -19,6 +19,7 @@
             <form id="signupform" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm()">
               <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
               <button name="submit" type="submit" id="signup-submit">Keep me updated</button>
+              <a href="https://twitter.com/BriarApp"><img id="twitterbutton" src="img/twitter.png"/></a>
             </form>
             <div id="signupconf">Thanks! We'll keep you updated.</div>
             <script language="JavaScript">