diff --git a/Changelog.md b/Changelog.md
index ecdf24b5b..d3baa742d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -92,6 +92,7 @@ This is disabled by default since it requires the installation of additional pac
 * Fix Publisher doesn't expand while uloading images [#3098](https://github.com/diaspora/diaspora/issues/3098)
 * Drop unneeded and too open crossdomain.xml
 * Fix hidden aspect dropdown on getting started page [#5407](https://github.com/diaspora/diaspora/pulls/5407)
+* Fix a few issues on Bootstrap pages [#5401](https://github.com/diaspora/diaspora/pull/5401)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 91ac2dc9e..764b42973 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -66,6 +66,10 @@ body {
   };
 }
 
+header {
+  line-height: 20px;
+}
+
 a {
   color: $blue;
   text: {
diff --git a/app/assets/stylesheets/bootstrap-fix.css.scss b/app/assets/stylesheets/bootstrap-fix.css.scss
new file mode 100644
index 000000000..468c84d3f
--- /dev/null
+++ b/app/assets/stylesheets/bootstrap-fix.css.scss
@@ -0,0 +1,11 @@
+// A temporary fix for broken classes in bootstrap 2.
+// Can probably be removed when migration of bootstrap 3 is done.
+
+input::-moz-placeholder,
+textarea::-moz-placeholder {
+  color: #999999;
+}
+input::-ms-input-placeholder,
+textarea::-ms-input-placeholder {
+  color: #999999;
+}
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss
index 6c5ab9025..909200c32 100644
--- a/app/assets/stylesheets/header.css.scss
+++ b/app/assets/stylesheets/header.css.scss
@@ -233,6 +233,7 @@ body > header {
         border: 1px solid #222;
         font-size: 13px;
         padding: 4px;
+        margin-top: 1px;
 
         &:hover { background-color: #555; }
 
@@ -345,7 +346,7 @@ body > header {
     float: left;
     height: 100%;
     margin-right: 5px;
-    margin-top: 3px;
+    margin-top: 2px;
 
     a {
       padding: 0 10px;
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index 2b11270c9..06752bfc8 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -1,3 +1,5 @@
+@import 'bootstrap-fix';
+
 @import 'perfect-scrollbar';
 
 @import "colors";