diff --git a/themes/openpowerfoundation/assets/css/main.css b/themes/openpowerfoundation/assets/css/main.css
index 71bd4fd..53f755b 100644
--- a/themes/openpowerfoundation/assets/css/main.css
+++ b/themes/openpowerfoundation/assets/css/main.css
@@ -4949,7 +4949,19 @@ textarea.form-control-lg {
 }
 
 .social__list {
+}
+.social__list ul {
+}
+.social__list ul > li {
+}
+.social__list ul > li > ul {
 	display: flex;
+	list-style: none;
+	padding: 0;
+}
+.social__list ul > li > ul > li {
+	padding-left: 0.5rem;
+	padding-right: 0.5rem;
 }
 .social__item {
 	display: block;
@@ -4962,19 +4974,9 @@ textarea.form-control-lg {
 	background-color: #fff;
 }
 .social__item i {
-	padding-left: 5px;
+	padding-left: 25%;
 	color: #2566f4;
 }
-  .social__item:not(:last-child) {
-    margin-right: .5em; }
-  .social__item._tw {
-    background-image: url(../img/tw.svg); }
-  .social__item._fb {
-    background-image: url(../img/fb.svg); }
-  .social__item._in {
-    background-image: url(../img/in.svg); }
-  .social__item._yt {
-    background-image: url(../img/yt.svg); }
 
 .ready-footer {
 	color: #666666;
diff --git a/themes/openpowerfoundation/layouts/partials/footer.html b/themes/openpowerfoundation/layouts/partials/footer.html
index a69eeb4..40b0ed0 100644
--- a/themes/openpowerfoundation/layouts/partials/footer.html
+++ b/themes/openpowerfoundation/layouts/partials/footer.html
@@ -46,14 +46,40 @@
 			</div>
 		</div>
 		<div class="col-md-3">
-			<p>Stay in touch, follow us:</p>
-			<div class="social__list pb-4 pb-lg-0">
-			{{ range .Site.Menus.social }}
-				<a target="_blank" class="social__item" href="{{ .URL }}">
-					<i class="{{ .Pre }}"></i>
-					<span class="visually-hidden">{{ .Name }}</span>
-				</a>
-			{{ end }}
+			<h3 class="footer_info-title">Stay in touch, follow us</h3>
+			<div class="social__list">
+				<ul>
+					<li>Social Links<ul>
+					{{ range .Site.Menus.social }}
+						<li>
+							<a target="_blank" class="social__item" href="{{ .URL }}">
+								<i class="{{ .Pre }}"></i>
+								<span class="visually-hidden">{{ .Name }}</span>
+							</a>
+						</li>
+					{{ end }}
+					</ul></li>
+					<li>Discussion Links<ul>
+					{{ range .Site.Menus.discuss }}
+						<li>
+							<a target="_blank" class="social__item" href="{{ .URL }}">
+								<i class="{{ .Pre }}"></i>
+								<span class="visually-hidden">{{ .Name }}</span>
+							</a>
+						</li>
+					{{ end }}
+					</ul></li>
+					<li>Code Links<ul>
+					{{ range .Site.Menus.code }}
+						<li>
+							<a target="_blank" class="social__item" href="{{ .URL }}">
+								<i class="{{ .Pre }}"></i>
+								<span class="visually-hidden">{{ .Name }}</span>
+							</a>
+						</li>
+					{{ end }}
+					</ul></li>
+				</ul>
 			</div>
 		</div>
 	</div>