diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css
--- a/kallithea/public/css/style.css
+++ b/kallithea/public/css/style.css
@@ -1324,9 +1324,6 @@ a.metatag[data-tag="license"]:hover {
     margin: 0;
     padding: 0 10px 4px;
     margin: -10px 0 0;
-}
-
-#footer div#footer-inner {
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
@@ -1334,19 +1331,13 @@ a.metatag[data-tag="license"]:hover {
     border-radius: 4px 4px 4px 4px;
 }
 
-#footer div#footer-inner p {
+#footer > span {
     padding: 15px 25px 15px 0;
     color: #FFF;
     font-weight: 700;
 }
 
-#footer div#footer-inner .footer-link {
-    float: left;
-    padding-left: 10px;
-}
-
-#footer div#footer-inner .footer-link a,
-#footer div#footer-inner .footer-link-right a {
+#footer .navbar-link {
     color: #FFF;
 }
 
diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html
--- a/kallithea/templates/base/base.html
+++ b/kallithea/templates/base/base.html
@@ -11,27 +11,23 @@
 <!-- END CONTENT -->
 
 <!-- FOOTER -->
-<div id="footer">
-   <div id="footer-inner" class="title">
-       <div>
-           <p class="footer-link pull-left">
-               ${_('Server instance: %s') % c.instance_id if c.instance_id else ''}
-           </p>
-           <p class="footer-link pull-right">
-               This site is powered by
-               %if c.visual.show_version:
-                   <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},
-               %else:
-                   <a href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
-               %endif
-               which is
-               <a href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2017 by various authors &amp; licensed under GPLv3</a>.
-               %if c.issues_url:
-                   &ndash; <a href="${c.issues_url}" target="_blank">${_('Support')}</a>
-               %endif
-           </p>
-       </div>
-   </div>
+<div id="footer" class="footer navbar navbar-inverse">
+    <span class="navbar-text pull-left">
+        ${_('Server instance: %s') % c.instance_id if c.instance_id else ''}
+    </span>
+    <span class="navbar-text pull-right">
+        This site is powered by
+        %if c.visual.show_version:
+            <a class="navbar-link" href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a> ${c.kallithea_version},
+        %else:
+            <a class="navbar-link" href="${h.url('kallithea_project_url')}" target="_blank">Kallithea</a>,
+        %endif
+        which is
+        <a class="navbar-link" href="${h.canonical_url('about')}#copyright">&copy; 2010&ndash;2017 by various authors &amp; licensed under GPLv3</a>.
+        %if c.issues_url:
+            &ndash; <a class="navbar-link" href="${c.issues_url}" target="_blank">${_('Support')}</a>
+        %endif
+    </span>
 </div>
 
 <!-- END FOOTER -->