diff --git a/includes/templates/Footer.mustache b/includes/templates/Footer.mustache
index e44498ca..a9dce4ba 100644
--- a/includes/templates/Footer.mustache
+++ b/includes/templates/Footer.mustache
@@ -27,25 +27,29 @@
 	</div>
 	{{/html-lastmodified}}
 	<div id="footer-content">
-		<div id="footer-sitetitle" class="mw-wiki-title">{{{msg-sitetitle}}}</div>
-		<div id="footer-desc">{{{msg-citizen-footer-desc}}}</div>
+		<h2 id="footer-sitetitle" class="mw-wiki-title">{{{msg-sitetitle}}}</h2>
+		<p id="footer-desc">{{{msg-citizen-footer-desc}}}</p>
 		{{#array-footer-rows}}
-		<ul id="{{id}}" {{#className}}class="{{.}}"{{/className}}>
-			{{#array-items}}
-			<li id="{{id}}">{{{html}}}</li>
-			{{/array-items}}
-		</ul>
-		{{/array-footer-rows}}
-	</div>
-	<div id="footer-bottom">
-		<div id="footer-bottom-content">
-			<div id="footer-tagline">{{{msg-citizen-footer-tagline}}}</div>
-			{{#array-footer-icons}}
-			<ul id="{{id}}" {{#className}}class="{{.}}"{{/className}}>
+		<nav id="{{id}}" {{#className}}class="{{.}}"{{/className}}>
+			<ul>
 				{{#array-items}}
 				<li id="{{id}}">{{{html}}}</li>
 				{{/array-items}}
 			</ul>
+		</nav>
+		{{/array-footer-rows}}
+	</div>
+	<div id="footer-bottom">
+		<div id="footer-bottom-content">
+			<span id="footer-tagline">{{{msg-citizen-footer-tagline}}}</span>
+			{{#array-footer-icons}}
+			<nav id="{{id}}" {{#className}}class="{{.}}"{{/className}}>
+				<ul>
+					{{#array-items}}
+					<li id="{{id}}">{{{html}}}</li>
+					{{/array-items}}
+				</ul>
+			</nav>
 			{{/array-footer-icons}}
 		</div>
 	</div>
diff --git a/resources/components/common.less b/resources/components/common.less
index dcb11ee6..ed357bd8 100644
--- a/resources/components/common.less
+++ b/resources/components/common.less
@@ -229,6 +229,7 @@ a {
 
 .mw-wiki-title {
 	font-family: @fonts-secondary !important;
+	font-weight: normal;
 	text-transform: uppercase;
 	letter-spacing: 2px;
 
diff --git a/resources/components/footer.less b/resources/components/footer.less
index 96647e7a..a2eb9f73 100644
--- a/resources/components/footer.less
+++ b/resources/components/footer.less
@@ -53,6 +53,12 @@
 		}
 	}
 
+	ul {
+		margin: 0;
+		display: flex;
+    	flex-wrap: wrap;
+	}
+
 	li {
 		list-style: none;
 	}
@@ -65,11 +71,6 @@
 		max-width: @footer-width;
 		display: flex;
 		flex-direction: column;
-
-		> ul,
-		> div {
-			margin: @margin-side / 2 0;
-		}
 	}
 
 	&-bottom {
@@ -88,10 +89,15 @@
 	}
 
 	&-sitetitle {
+		margin: @margin-side / 2 0;
 		color: @base-90;
 		font-size: 20px;
 	}
 
+	&-desc {
+		margin: @margin-side / 2 0;
+	}
+
 	&-places {
 		margin: 0 -@margin-side !important;
 		display: flex;
@@ -104,6 +110,7 @@
 	}
 
 	&-info {
+		margin-top: @margin-side / 2;
 		opacity: 0.5;
 		font-size: 12px;