diff --git a/about.html b/about.html
index ae179d1c9305191d0c3b9040df188858188360f6..41f59535cdd5b0d4bc2d692e6dd2ac7f8f12a523 100644
--- a/about.html
+++ b/about.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -76,6 +78,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/apk.html b/apk.html
index f79f430497bebf722dd4b57f86562f3a5a4cd0a5..01268cff8454a0e0ab4c6b8f304aed6b36243d99 100644
--- a/apk.html
+++ b/apk.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -80,6 +82,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/building.html b/building.html
index c201f92dcc06d86f7153039ec6dba4dcf78490e8..341d63c7ad103e926573bd3196cfa16784159fef 100644
--- a/building.html
+++ b/building.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -106,6 +108,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/copyright.html b/copyright.html
index fc31e5792bb8f0c1afaac80332403aa207f3c0a2..d2ecdfd37eec46d928bd3b995ef538906e1a6158 100644
--- a/copyright.html
+++ b/copyright.html
@@ -15,10 +15,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -69,6 +71,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/css/styles.css b/css/styles.css
index 44dcba9d9ce3aae55739cc9ac72850cb06d35734..8119cfddf2890ece894b1259c52f708edafd2d4a 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -29,10 +29,8 @@ img {
     vertical-align:middle;
 }
 
-#twitterbutton {
-    width: 21px;
-    padding-left: 9px;
-    padding-top: 3px;
+.twitterbutton {
+    width: 24px;
 }
 
 #playbutton, #fdroidbutton {
@@ -149,6 +147,17 @@ figcaption {
 
 #signup2 {display:none;}
 
+#twitter {
+    float:right;
+    padding-left:12px;
+}
+
+#twitter2 {
+    float:left;
+    padding-left:15px;
+    padding-right:12px;
+}
+
 #signupform {
     height:30px;
     padding-bottom:10px;
@@ -157,13 +166,9 @@ figcaption {
 }
 
 #signupform2 {
-    height:auto;
-    padding-bottom:0;
+    height:30px;
     float:left;
-    width:80%;
-    font-size:1.5em;
-    padding-top:10px;
-    padding-left:0;
+    text-align:left;
 }
 
 #signupconf {
@@ -180,11 +185,10 @@ figcaption {
 #signupconf2 {
     display:none;
     float:left;
+    text-align:left;
     color:#fff;
-    font-size:1.2em;
+    font-size:0.9em;
     font-weight:bold;
-    padding-top:10px;
-    padding-left:15px;
 }
 
 #signupform input, textarea {
@@ -613,11 +617,9 @@ figcaption {
         margin:10px 10px 10px 15px;
     }
 
-    #footer {text-align:left;}
-
-    #footer form {
-        margin:10px 10px 0 15px;
-        padding:0;
+    #footer {
+        text-align:left;
+        margin-top:5px;
     }
 
     #signup2 {
diff --git a/download.html b/download.html
index 0d6fb67ca81bc656fd27b1a01edfaefc0785a00b..2d340363b92bc5506f11b532f8cdb4f1bfeb6dbd 100644
--- a/download.html
+++ b/download.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -75,6 +77,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/fdroid.html b/fdroid.html
index cbbb3322f6d9cc06b17c71a6fb3669b16d2b922c..b2a7db402ba6bb1c9b741ddc2509e0a0029cee5a 100644
--- a/fdroid.html
+++ b/fdroid.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -76,6 +78,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/get-involved.html b/get-involved.html
index 34593f3ee3a09707fa9e3f1058112a35924c6bf3..56154e6ad841ef59eb58a05ff033531b178b8b3c 100644
--- a/get-involved.html
+++ b/get-involved.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -66,6 +68,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/hiring.html b/hiring.html
index 582e6489fba5e0c1aeccdbb4189b73802a04afb4..70a7839eb377f0dec618cd1585fb59bf39bce9b7 100644
--- a/hiring.html
+++ b/hiring.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -63,6 +65,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/how-it-works.html b/how-it-works.html
index 872480e8d13fcd1b655fc41833437f5742490dc8..4bd3a51206d96fe39e41cdf1e5566b1b9e345fae 100644
--- a/how-it-works.html
+++ b/how-it-works.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -109,6 +111,9 @@ servers to block.</li>
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/index.html b/index.html
index fc4a1b26107e9ab1c0c8e55764c728dd3c353e8a..06a0f1caf98dccbe124d4957c22ce155a9134c62 100644
--- a/index.html
+++ b/index.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -92,6 +94,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/news/2017-beta-released-security-audit.html b/news/2017-beta-released-security-audit.html
index d17e44159afb604d44a55e85445cc53de294fa6d..a49654668d93484c0581273ff4863be59acef413 100644
--- a/news/2017-beta-released-security-audit.html
+++ b/news/2017-beta-released-security-audit.html
@@ -15,10 +15,12 @@
         <a href="../index.html"><div id="logo"><img src="../img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="../img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -127,6 +129,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="../img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>
diff --git a/privacy.html b/privacy.html
index c8e986a405fda53b335ba338fe680aa069b7e561..5500ab3111aed9cd5c4eed28a6034284a22024ce 100644
--- a/privacy.html
+++ b/privacy.html
@@ -16,10 +16,12 @@
         <a href="index.html"><div id="logo"><img src="img/briar_logo_large.png" alt="Briar" class="logo"/></div></a>
         <div id="nav">
           <div id="signup">
+            <div id="twitter">
+              <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+            </div> <!-- twitter -->
             <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">
@@ -81,6 +83,9 @@
   <div id="footer_container">
     <div id="footer">
       <div id="signup2">
+        <div id="twitter2">
+          <a href="https://twitter.com/BriarApp" target="_blank"><img class="twitterbutton" src="img/twitter.png"/></a>
+        </div> <!-- twitter2 -->
         <form id="signupform2" action="https://sourceforge.net/projects/briar/lists/briar-announce" target="_blank" method="get" onSubmit="submitForm2()">
           <input placeholder="Email address" type="email" name="email" tabindex="2"></input>
           <button name="submit" type="submit" id="signup-submit2">Keep me updated</button>