diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index 8380b3c427..2ed0dc5bd1 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -59,7 +59,7 @@ module StatusesHelper
   end
 
   def svg_logo_full
-    content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678')
+    content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 180 80')
   end
 
   def account_badge(account, all: false)
diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg
index 074e98d89d..dcee054c27 100644
--- a/app/javascript/images/logo.svg
+++ b/app/javascript/images/logo.svg
@@ -1,14 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 285 285">
-<path d="M222.909,86.242c-5.771-46.754-32.346-85.796-80.242-86.198V0c-0.125,0-0.245,0.016-0.37,0.016
-		c-0.125,0-0.245-0.016-0.37-0.016v0.044C94.031,0.446,67.455,39.488,61.685,86.242c-1.039,8.425,3.682,15.333,9.388,15.333
-		c5.7,0,10.204-6.924,11.4-15.322c5.075-35.702,22.529-65.715,59.83-65.916c37.296,0.201,54.755,30.214,59.83,65.916
-		c1.197,8.403,5.695,15.322,11.395,15.322C219.222,101.575,223.948,94.661,222.909,86.242z" fill="#3088d4"/>
-	<path  d="M246.515,108.156c-0.174-0.201-0.348-0.397-0.533-0.598c-5.749-6.244-13.01-1.686-16.138,1.452
-		c-1.463,1.469-3.758,2.567-7.37,2.567h-19.918c0,0-4.547,0.272-7.734-2.393c-3.497-2.943-9.915-7.392-18.406-7.392h-69.62
-		c-8.49,0-15.186,4.079-18.281,7.158c-1.496,1.485-3.775,2.627-7.223,2.627H61.396c-3.432,0-5.744-1.246-7.288-2.85
-		c-3.084-3.209-10.949-7.598-17.204-1.86c-3.291,3.035-5.863,7.762-5.863,15.131v140.355c0,0-0.326,21.49,21.169,21.49h180.033
-		c0,0,20.56-0.321,20.56-19.912V137.369C252.808,128.879,252.03,114.607,246.515,108.156z M158.81,201.109
-		c-2.159,4.34-5.515,12.624-5.515,19.885c0,7.261-5.309,13.152-11.852,13.152c-6.543,0-11.846-5.891-11.846-13.152
-		c0-7.261-3.356-15.545-5.515-19.885c-1.267-2.551-1.985-5.417-1.985-8.469c0-10.677,8.664-19.347,19.347-19.347
-		c10.688,0,19.347,8.67,19.347,19.347C160.795,195.692,160.072,198.558,158.81,201.109z" fill="#3088d4"/>
-		</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 57.484 71.644" fill="#2ea7e0"><path d="M0 21.607h7.203v50.416H0z"/><path d="M0 64.82h57.62v7.202H0z"/><path d="M50.417 14.405h7.202V64.82h-7.202z"/><path d="M43.215 0h7.203v14.405h-7.203z"/><path d="M14.405 0h36.013v7.202H14.405zm21.607 42.045c0 1.17-5.74.42-7.202 1.17-4.313 2.217-5.017 7.2-5.017 7.2-2.186 0-2.186 0-2.186-8.37V29.98a1.17 1.17 0 0 1 1.17-1.17h12.065a1.17 1.17 0 0 1 1.17 1.17v12.066z"/><path d="M7.203 0h7.202v14.405H7.203z"/></svg>
diff --git a/app/javascript/images/logo_alt.svg b/app/javascript/images/logo_alt.svg
index 597fd5cc8c..dcee054c27 100644
--- a/app/javascript/images/logo_alt.svg
+++ b/app/javascript/images/logo_alt.svg
@@ -1,18 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 285 285" >
-<g transform="rotate(180 142 142)">
-<path d="M222.909,86.242c-5.771-46.754-32.346-85.796-80.242-86.198V0c-0.125,0-0.245,0.016-0.37,0.016
-		c-0.125,0-0.245-0.016-0.37-0.016v0.044C94.031,0.446,67.455,39.488,61.685,86.242c-1.039,8.425,3.682,15.333,9.388,15.333
-		c5.7,0,10.204-6.924,11.4-15.322c5.075-35.702,22.529-65.715,59.83-65.916c37.296,0.201,54.755,30.214,59.83,65.916
-		c1.197,8.403,5.695,15.322,11.395,15.322C219.222,101.575,223.948,94.661,222.909,86.242z" fill="#3088d4" transform="scale(1,0.6) translate(0,15)"/>
-	<path  d="M246.515,108.156c-0.174-0.201-0.348-0.397-0.533-0.598c-5.749-6.244-13.01-1.686-16.138,1.452
-		c-1.463,1.469-3.758,2.567-7.37,2.567h-19.918c0,0-4.547,0.272-7.734-2.393c-3.497-2.943-9.915-7.392-18.406-7.392h-69.62
-		c-8.49,0-15.186,4.079-18.281,7.158c-1.496,1.485-3.775,2.627-7.223,2.627H61.396c-3.432,0-5.744-1.246-7.288-2.85
-		c-3.084-3.209-10.949-7.598-17.204-1.86c-3.291,3.035-5.863,7.762-5.863,15.131v140.355c0,0-0.326,21.49,21.169,21.49h180.033
-		c0,0,20.56-0.321,20.56-19.912V137.369C252.808,128.879,252.03,114.607,246.515,108.156z M158.81,201.109
-		c-2.159,4.34-5.515,12.624-5.515,19.885c0,7.261-5.309,13.152-11.852,13.152c-6.543,0-11.846-5.891-11.846-13.152
-		c0-7.261-3.356-15.545-5.515-19.885c-1.267-2.551-1.985-5.417-1.985-8.469c0-10.677,8.664-19.347,19.347-19.347
-		c10.688,0,19.347,8.67,19.347,19.347C160.795,195.692,160.072,198.558,158.81,201.109z" fill="#3088d4" transform="scale(1,0.8) translate(0,-10)" />
-</g>
-	<ellipse cx="90"  cy="50" rx="32" ry="43" fill="black"/>
-	<ellipse cx="195" cy="50" rx="32" ry="43" fill="black"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 57.484 71.644" fill="#2ea7e0"><path d="M0 21.607h7.203v50.416H0z"/><path d="M0 64.82h57.62v7.202H0z"/><path d="M50.417 14.405h7.202V64.82h-7.202z"/><path d="M43.215 0h7.203v14.405h-7.203z"/><path d="M14.405 0h36.013v7.202H14.405zm21.607 42.045c0 1.17-5.74.42-7.202 1.17-4.313 2.217-5.017 7.2-5.017 7.2-2.186 0-2.186 0-2.186-8.37V29.98a1.17 1.17 0 0 1 1.17-1.17h12.065a1.17 1.17 0 0 1 1.17 1.17v12.066z"/><path d="M7.203 0h7.202v14.405H7.203z"/></svg>
diff --git a/app/javascript/images/logo_full.svg b/app/javascript/images/logo_full.svg
index 23cc44fb4a..c2e7f7659a 100644
--- a/app/javascript/images/logo_full.svg
+++ b/app/javascript/images/logo_full.svg
@@ -1,18 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-<symbol id="mastodon-svg-logo-full" viewBox="0 0 713.35878 175.8678">
-
-<path d="M222.909,86.242c-5.771-46.754-32.346-85.796-80.242-86.198V0c-0.125,0-0.245,0.016-0.37,0.016
-		c-0.125,0-0.245-0.016-0.37-0.016v0.044C94.031,0.446,67.455,39.488,61.685,86.242c-1.039,8.425,3.682,15.333,9.388,15.333
-		c5.7,0,10.204-6.924,11.4-15.322c5.075-35.702,22.529-65.715,59.83-65.916c37.296,0.201,54.755,30.214,59.83,65.916
-		c1.197,8.403,5.695,15.322,11.395,15.322C219.222,101.575,223.948,94.661,222.909,86.242z" fill="#3088d4"  transform="scale(0.5) translate(-25, 45) rotate(-15)"/>
-	<path  d="M246.515,108.156c-0.174-0.201-0.348-0.397-0.533-0.598c-5.749-6.244-13.01-1.686-16.138,1.452
-		c-1.463,1.469-3.758,2.567-7.37,2.567h-19.918c0,0-4.547,0.272-7.734-2.393c-3.497-2.943-9.915-7.392-18.406-7.392h-69.62
-		c-8.49,0-15.186,4.079-18.281,7.158c-1.496,1.485-3.775,2.627-7.223,2.627H61.396c-3.432,0-5.744-1.246-7.288-2.85
-		c-3.084-3.209-10.949-7.598-17.204-1.86c-3.291,3.035-5.863,7.762-5.863,15.131v140.355c0,0-0.326,21.49,21.169,21.49h180.033
-		c0,0,20.56-0.321,20.56-19.912V137.369C252.808,128.879,252.03,114.607,246.515,108.156z M158.81,201.109
-		c-2.159,4.34-5.515,12.624-5.515,19.885c0,7.261-5.309,13.152-11.852,13.152c-6.543,0-11.846-5.891-11.846-13.152
-		c0-7.261-3.356-15.545-5.515-19.885c-1.267-2.551-1.985-5.417-1.985-8.469c0-10.677,8.664-19.347,19.347-19.347
-		c10.688,0,19.347,8.67,19.347,19.347C160.795,195.692,160.072,198.558,158.81,201.109z" fill="#3088d4"  transform="scale(0.5) translate(0, 20)"/>
-<text transform="" xml:space="preserve" text-anchor="start" font-family="FangSong, sans-serif" font-size="90" font-weight="bold" id="svg_text" y="110" x="100" stroke-width="1" >[闭社] - 清华站</text>
+<symbol id="mastodon-svg-logo-full" viewBox="0 0 180 80" fill="#2d87c9">
+<path d="M0 21.607h7.203v50.416H0z"/><path d="M0 64.82h57.62v7.202H0z"/><path d="M50.417 14.405h7.202V64.82h-7.202z"/><path d="M43.215 0h7.203v14.405h-7.203z"/><path d="M14.405 0h36.013v7.202H14.405zm21.607 42.045c0 1.17-5.74.42-7.202 1.17-4.313 2.217-5.017 7.2-5.017 7.2-2.186 0-2.186 0-2.186-8.37V29.98a1.17 1.17 0 0 1 1.17-1.17h12.065a1.17 1.17 0 0 1 1.17 1.17v12.066zm94.452-11.638h19.32v3.47h-19.32zM72.044 17.14h4.123v37.608h-4.123z"/><path d="M72.044 14.67h8.247v3.762h-8.247zm0 40.08h8.247v3.76h-8.247zm82.286-37.6h4.124v37.608h-4.124z"/><path d="M150.208 14.67h8.247v3.762h-8.247zm0 40.08h8.247v3.76h-8.247zM81.93 14.67h3.76v3.762h-3.76zm37.626 0h3.76v3.762h-3.76zM81.93 25.93h3.243v32.83H81.93zm3.77-8.052v3.288h27.12l-.113 33.037c0 .667-.222.8-.9.857-.417.037-1.72.094-3.244.093v3.275h7.5v-40.55H85.7z"/><path d="M90.082 31.087H113.8v2.79H90.082z"/><path d="M103.19 25.773h2.52V51.35h-2.52z"/><path d="M97.653 50.806h5.54v2.907h-5.54zm18.4-26.623h14.4v3.542h-14.4z"/><path d="M127.3 26.665h3.163v7.2H127.3zm-7.32 11.787h2.913v19.984h-2.913z"/><path d="M116.053 39.597l11.345-7.935 3.066 2.214-14.4 9.75zm-25.97 4.968l13.1-8.47 2.52 2.436-15.628 10.06zm46.626-26.687h3.493v40.56h-3.493z"/><path d="M122.372 55.255h26.146v3.182h-26.146zM7.203 0h7.202v14.405H7.203z"/>
 </symbol>
 </svg>
diff --git a/app/javascript/images/logo_transparent.svg b/app/javascript/images/logo_transparent.svg
index a1e7b403e0..078281a270 100644
--- a/app/javascript/images/logo_transparent.svg
+++ b/app/javascript/images/logo_transparent.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg"><symbol id="mastodon-svg-logo" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" /></symbol></svg>
+<svg xmlns="http://www.w3.org/2000/svg"><symbol id="mastodon-svg-logo" viewBox="0 0 57.484 71.644"><path d="M0 21.607h7.203v50.416H0z"/><path d="M0 64.82h57.62v7.202H0z"/><path d="M50.417 14.405h7.202V64.82h-7.202z"/><path d="M43.215 0h7.203v14.405h-7.203z"/><path d="M14.405 0h36.013v7.202H14.405zm21.607 42.045c0 1.17-5.74.42-7.202 1.17-4.313 2.217-5.017 7.2-5.017 7.2-2.186 0-2.186 0-2.186-8.37V29.98a1.17 1.17 0 0 1 1.17-1.17h12.065a1.17 1.17 0 0 1 1.17 1.17v12.066z"/><path d="M7.203 0h7.202v14.405H7.203z"/></symbol></svg>
diff --git a/app/javascript/images/logo_transparent_black.svg b/app/javascript/images/logo_transparent_black.svg
index e44bcf5e14..43f3f4dfd5 100644
--- a/app/javascript/images/logo_transparent_black.svg
+++ b/app/javascript/images/logo_transparent_black.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 216.4144 232.00976"><path d="M107.86523 0C78.203984.2425 49.672422 3.4535937 33.044922 11.089844c0 0-32.97656262 14.752031-32.97656262 65.082031 0 11.525-.224375 25.306175.140625 39.919925 1.19750002 49.22 9.02375002 97.72843 54.53124962 109.77343 20.9825 5.55375 38.99711 6.71547 53.505856 5.91797 26.31125-1.45875 41.08203-9.38867 41.08203-9.38867l-.86914-19.08984s-18.80171 5.92758-39.91796 5.20508c-20.921254-.7175-43.006879-2.25516-46.390629-27.94141-.3125-2.25625-.46875-4.66938-.46875-7.20313 0 0 20.536953 5.0204 46.564449 6.21289 15.915.73001 30.8393-.93343 45.99805-2.74218 29.07-3.47125 54.38125-21.3818 57.5625-37.74805 5.0125-25.78125 4.59961-62.916015 4.59961-62.916015 0-50.33-32.97461-65.082031-32.97461-65.082031C166.80539 3.4535938 138.255.2425 108.59375 0h-.72852zM74.296875 39.326172c12.355 0 21.710234 4.749297 27.896485 14.248047l6.01367 10.080078 6.01563-10.080078c6.185-9.49875 15.54023-14.248047 27.89648-14.248047 10.6775 0 19.28156 3.753672 25.85156 11.076172 6.36875 7.3225 9.53907 17.218828 9.53907 29.673828v60.941408h-24.14454V81.869141c0-12.46875-5.24453-18.798829-15.73828-18.798829-11.6025 0-17.41797 7.508516-17.41797 22.353516v32.375002H96.207031V85.423828c0-14.845-5.815468-22.353515-17.417969-22.353516-10.49375 0-15.740234 6.330079-15.740234 18.798829v59.148439H38.904297V80.076172c0-12.455 3.171016-22.351328 9.541015-29.673828 6.568751-7.3225 15.172813-11.076172 25.851563-11.076172z" fill="#000"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 57.484 71.644" fill="#000"><path d="M0 21.607h7.203v50.416H0z"/><path d="M0 64.82h57.62v7.202H0z"/><path d="M50.417 14.405h7.202V64.82h-7.202z"/><path d="M43.215 0h7.203v14.405h-7.203z"/><path d="M14.405 0h36.013v7.202H14.405zm21.607 42.045c0 1.17-5.74.42-7.202 1.17-4.313 2.217-5.017 7.2-5.017 7.2-2.186 0-2.186 0-2.186-8.37V29.98a1.17 1.17 0 0 1 1.17-1.17h12.065a1.17 1.17 0 0 1 1.17 1.17v12.066z"/><path d="M7.203 0h7.202v14.405H7.203z"/></svg>
diff --git a/app/javascript/images/mailer/logo_full.png b/app/javascript/images/mailer/logo_full.png
index c59c90bcb6..948d33847e 100644
Binary files a/app/javascript/images/mailer/logo_full.png and b/app/javascript/images/mailer/logo_full.png differ
diff --git a/app/javascript/images/mailer/logo_transparent.png b/app/javascript/images/mailer/logo_transparent.png
index 6dbcc2e8df..c8a75c177b 100644
Binary files a/app/javascript/images/mailer/logo_transparent.png and b/app/javascript/images/mailer/logo_transparent.png differ
diff --git a/app/javascript/styles/mastodon/about.scss b/app/javascript/styles/mastodon/about.scss
index cf16b54ac1..19b79c4d4d 100644
--- a/app/javascript/styles/mastodon/about.scss
+++ b/app/javascript/styles/mastodon/about.scss
@@ -697,7 +697,7 @@ $small-breakpoint: 960px;
 
     svg {
       fill: $primary-text-color;
-      height: 52px;
+      height: 100px;
     }
 
     @media screen and (max-width: $no-gap-breakpoint) {
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 7a99a19641..a80f5b782d 100644
Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index b12aa55a3a..9234405ada 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index e11ee89ad4..b40cee8078 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index a4994062de..8d2e2ec152 100644
Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ