diff --git a/app/javascript/src/javascripts/common.js b/app/javascript/src/javascripts/common.js
index 3401df5b1..e1d8c3065 100644
--- a/app/javascript/src/javascripts/common.js
+++ b/app/javascript/src/javascripts/common.js
@@ -1,5 +1,4 @@
 import Cookie from './cookie'
-import CurrentUser from './current_user'
 
 $(function() {
   $("#hide-upgrade-account-notice").on("click.danbooru", function(e) {
@@ -20,12 +19,6 @@ $(function() {
     $('#notice').fadeOut("fast");
     e.preventDefault();
   });
-
-  $("#desktop-version-link a").on("click.danbooru", async function(e) {
-    e.preventDefault();
-    await CurrentUser.update({ enable_desktop_mode: true });
-    location.reload();
-  });
 });
 
 window.submitInvisibleRecaptchaForm = function () {
diff --git a/app/javascript/src/styles/base/020_base.scss b/app/javascript/src/styles/base/020_base.scss
index d9cb265cf..4dbfee03a 100644
--- a/app/javascript/src/styles/base/020_base.scss
+++ b/app/javascript/src/styles/base/020_base.scss
@@ -126,7 +126,7 @@ table tfoot {
 }
 
 .text-small {
-  font-size: 0.8em;
+  font-size: 0.9em;
 }
 
 .fixed-width-container {
diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss
index e76b157a9..1af5253b4 100644
--- a/app/javascript/src/styles/common/main_layout.scss
+++ b/app/javascript/src/styles/common/main_layout.scss
@@ -30,6 +30,12 @@ footer#page-footer {
   text-align: center;
   padding: 1em 0 1em;
   border-top: var(--footer-border);
+
+  .social-icon img {
+    vertical-align: bottom;
+    margin: 0 0.1em;
+    height: 16px;
+  }
 }
 
 .sidebar-container {
diff --git a/app/views/static/_footer.html.erb b/app/views/static/_footer.html.erb
index f17b4b5c8..d8b75bf17 100644
--- a/app/views/static/_footer.html.erb
+++ b/app/views/static/_footer.html.erb
@@ -1,21 +1,23 @@
 <footer id="page-footer" class="text-small">
   <span class="page-footer-app-name"><%= Danbooru.config.app_name %></span>
-  <% if Rails.application.config.x.git_hash %>
-    <span class="desktop-only page-footer-git-hash">
-      (<%= link_to Rails.application.config.x.git_hash.first(9), Danbooru.config.commit_url(Rails.application.config.x.git_hash) %>)
-    </span>
-  <% end %>
-  &ndash; <%= link_to "Rules", terms_of_service_path %>
-  &ndash; <%= link_to "Contact", contact_path %>
-  <% if CurrentUser.user.enable_post_navigation %>
-    <span id="keyboard-shortcuts-link" class="desktop-only">
-      &ndash; <%= link_to "Keyboard shortcuts", keyboard_shortcuts_path %>
-    </span>
-  <% end %>
-  <% if CurrentUser.is_member? %>
-    <span id="desktop-version-link" class="mobile-only">
-      &ndash;
-      <%= link_to "Desktop mode", edit_user_path(CurrentUser.id) %>
-    </span>
-  <% end %>
+  / <%= link_to "Rules", terms_of_service_path %>
+  / <%= link_to "Contact", contact_path %>
+  /
+  <span class="social-icons">
+    <% if Danbooru.config.source_code_url.present? %>
+      <%= link_to Danbooru.config.source_code_url, title: "Running commit: #{Rails.application.config.x.git_hash.first(9)}", class: "social-icon" do %>
+        <img src="images/github-logo.png">
+      <% end %>
+    <% end %>
+    <% if Danbooru.config.twitter_username.present? %>
+      <%= link_to "https://twitter.com/#{Danbooru.config.twitter_username}", class: "social-icon" do %>
+        <img src="images/twitter-logo.png">
+      <% end %>
+    <% end %>
+    <% if Danbooru.config.discord_server_url.present? %>
+      <%= link_to Danbooru.config.discord_server_url, class: "social-icon" do %>
+        <img src="images/discord-logo.png">
+      <% end %>
+    <% end %>
+  </span>
 </footer>
diff --git a/config/danbooru_default_config.rb b/config/danbooru_default_config.rb
index 5b728f4d5..634dde958 100644
--- a/config/danbooru_default_config.rb
+++ b/config/danbooru_default_config.rb
@@ -425,6 +425,11 @@ module Danbooru
       end
     end
 
+    # The url of the Discord server associated with this site.
+    def discord_server_url
+      nil
+    end
+
     # The twitter username associated with this site (username only, don't include the @-sign).
     def twitter_username
       nil
diff --git a/public/images/discord-logo.png b/public/images/discord-logo.png
new file mode 100755
index 000000000..d104a6175
Binary files /dev/null and b/public/images/discord-logo.png differ
diff --git a/public/images/github-logo.png b/public/images/github-logo.png
new file mode 100755
index 000000000..6f98ddf1e
Binary files /dev/null and b/public/images/github-logo.png differ
diff --git a/public/images/twitter-logo.png b/public/images/twitter-logo.png
new file mode 100755
index 000000000..fc30e86b9
Binary files /dev/null and b/public/images/twitter-logo.png differ