diff --git a/system/admin/views/config-widget.html.php b/system/admin/views/config-widget.html.php
index 68f63cc..4f22a0b 100644
--- a/system/admin/views/config-widget.html.php
+++ b/system/admin/views/config-widget.html.php
@@ -274,6 +274,12 @@
       <input type="text" name="-config-social.tiktok" class="form-control" id="social.tiktok" value="<?php echo config('social.tiktok');?>" placeholder="https://tiktok.com/@username">
     </div>
   </div>
+  <div class="form-group row">
+    <label for="social.youtube" class="col-sm-2 col-form-label">Youtube</label>
+    <div class="col-sm-10">
+      <input type="text" name="-config-social.youtube" class="form-control" id="social.youtube" value="<?php echo config('social.youtube');?>" placeholder="https://www.youtube.com/user/username">
+    </div>
+  </div>
   <div class="form-group row">
     <div class="col-sm-10">
       <button type="submit" class="btn btn-primary"><?php echo i18n('Save_Config');?></button>
diff --git a/themes/twentyfifteen/css/style.css b/themes/twentyfifteen/css/style.css
index 0d05950..c40ee97 100644
--- a/themes/twentyfifteen/css/style.css
+++ b/themes/twentyfifteen/css/style.css
@@ -892,6 +892,18 @@ a:focus {
 	content: "\f220";
 }
 
+.social-navigation a[href*="tiktok.com"]:before {
+	content:"\f108";
+}
+
+.social-navigation a[href*="linkedin.com"]:before {
+	content:"\f207";
+}
+
+.social-navigation a.social-logo-mastodon:before {
+	content:"\f10a";
+}
+
 .secondary-toggle {
 	background-color: transparent;
 	border: 1px solid #eaeaea;
@@ -6145,4 +6157,9 @@ ul.month {
 	display:block;
 	box-shadow: none;
 	border: none;
+}
+
+.social-logo a {
+	height:35px;
+	width:35px;
 }
\ No newline at end of file
diff --git a/themes/twentyfifteen/css/style_v2.css b/themes/twentyfifteen/css/style_v2.css
index 876a59a..bc22ebd 100644
--- a/themes/twentyfifteen/css/style_v2.css
+++ b/themes/twentyfifteen/css/style_v2.css
@@ -893,6 +893,18 @@ a:focus {
 	content: "\f220";
 }
 
+.social-navigation a[href*="tiktok.com"]:before {
+	content:"\f108";
+}
+
+.social-navigation a[href*="linkedin.com"]:before {
+	content:"\f207";
+}
+
+.social-navigation a.social-logo-mastodon:before {
+	content:"\f10a";
+}
+
 .secondary-toggle {
 	background-color: transparent;
 	border: 1px solid #eaeaea;
@@ -6152,4 +6164,9 @@ ul.month {
 	display:block;
 	box-shadow: none;
 	border: none;
+}
+
+.social-logo a {
+	height:35px;
+	width:35px;
 }
\ No newline at end of file
diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php
index 82dcda6..01f8a3f 100644
--- a/themes/twentyfifteen/layout.html.php
+++ b/themes/twentyfifteen/layout.html.php
@@ -42,34 +42,12 @@
                     <aside class="widget widget_meta">
                         <h2 class="widget-title"><?php echo i18n("About");?></h2>
                         <p><?php echo blog_description() ?></p>
-                    </aside>          
-                    <?php if(!empty(config('social.twitter')) || !empty(config('social.facebook'))):?>					
+                    </aside>          				
                     <nav id="social-navigation" class="social-navigation" role="navigation">
                         <div class="menu-social-links-container">
-                            <ul id="menu-social-links" class="menu">
-							    <?php if(!empty(config('social.twitter'))):?>
-                                <li class="menu-item">
-                                    <a href="<?php echo config('social.twitter');?>">
-                                    <span class="screen-reader-text">Twitter</span>
-                                    </a>
-                                </li>
-								<?php endif;?>
-								<?php if(!empty(config('social.facebook'))):?>
-                                <li class="menu-item">
-                                    <a href="<?php echo config('social.facebook');?>">
-                                    <span class="screen-reader-text">Facebook</span>
-                                    </a>
-                                </li>
-								<?php endif;?>
-                                <li class="menu-item">
-                                    <a href="<?php echo site_url();?>feed/rss">
-                                    <span class="screen-reader-text">RSS</span>
-                                    </a>
-                                </li>
-                            </ul>
+                            <?php echo social();?>
                         </div>
                     </nav>
-					<?php endif;?>
                     <aside class="widget search">
                         <form><input type="search" name="search" class="form-control" placeholder="<?php echo i18n('Type_to_search');?>"></form>
                     </aside>                            
diff --git a/themes/twentysixteen/css/style.css b/themes/twentysixteen/css/style.css
index a28fd49..b67354b 100644
--- a/themes/twentysixteen/css/style.css
+++ b/themes/twentysixteen/css/style.css
@@ -1027,6 +1027,18 @@ a:active {
 	content: "\f413";
 }
 
+.social-navigation a[href*="tiktok.com"]:before {
+	content:"\f108";
+}
+
+.social-navigation a[href*="linkedin.com"]:before {
+	content:"\f207";
+}
+
+.social-navigation a.social-logo-mastodon:before {
+	content:"\f10a";
+}
+
 .post-navigation {
 	border-top: 4px solid #1a1a1a;
 	border-bottom: 4px solid #1a1a1a;
@@ -4071,4 +4083,13 @@ ul.month {
 	display:block;
 	box-shadow: none;
 	border: none;
+}
+
+.social-logo a {
+	height:35px;
+	width:35px;
+}
+
+.social-logo a:before {
+	line-height: 33px!important;
 }
\ No newline at end of file
diff --git a/themes/twentysixteen/layout.html.php b/themes/twentysixteen/layout.html.php
index 331e4d8..949023e 100644
--- a/themes/twentysixteen/layout.html.php
+++ b/themes/twentysixteen/layout.html.php
@@ -121,11 +121,7 @@
                 </nav><!-- .main-navigation -->
                 <nav aria-label="Footer Social Links Menu" role="navigation" class="social-navigation">
                     <div class="menu-social-links-container">
-                    <ul class="social-links-menu" id="menu-social-links">
-                        <?php if(!empty(config('social.twitter'))):?><li><a href="<?php echo config('social.twitter');?>"><span class="screen-reader-text">Twitter</span></a></li><?php endif;?>
-                        <?php if(!empty(config('social.facebook'))):?><li><a href="<?php echo config('social.facebook');?>"><span class="screen-reader-text">Facebook</span></a></li><?php endif;?>
-                        <li><a href="<?php echo site_url();?>feed/rss"><span class="screen-reader-text">RSS</span></a></li>
-                    </ul>
+                        <?php echo social();?>
                     </div>                
                 </nav>
                 <div class="site-info">