diff --git a/priv/static/index.html b/priv/static/index.html
index 1f081eed4..4d25be810 100644
--- a/priv/static/index.html
+++ b/priv/static/index.html
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Pleroma
-=======
-Pleroma
->>>>>>> 544bdbfb90d764a5aba8ed07c13b842838d76d73
+Pleroma
\ No newline at end of file
diff --git a/priv/static/static/font/fontello.1580306824221.woff b/priv/static/static/font/fontello.1580306824221.woff
deleted file mode 100644
index a9def0b0e..000000000
Binary files a/priv/static/static/font/fontello.1580306824221.woff and /dev/null differ
diff --git a/priv/static/static/font/fontello.1580306824221.woff2 b/priv/static/static/font/fontello.1580306824221.woff2
deleted file mode 100644
index 1c376282b..000000000
Binary files a/priv/static/static/font/fontello.1580306824221.woff2 and /dev/null differ
diff --git a/priv/static/static/font/fontello.1581007281335.eot b/priv/static/static/font/fontello.1581007281335.eot
deleted file mode 100644
index 3aae7d472..000000000
Binary files a/priv/static/static/font/fontello.1581007281335.eot and /dev/null differ
diff --git a/priv/static/static/font/fontello.1581007281335.svg b/priv/static/static/font/fontello.1581007281335.svg
deleted file mode 100644
index 44beba9a2..000000000
--- a/priv/static/static/font/fontello.1581007281335.svg
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/priv/static/static/font/fontello.1581007281335.ttf b/priv/static/static/font/fontello.1581007281335.ttf
deleted file mode 100644
index d3d19affe..000000000
Binary files a/priv/static/static/font/fontello.1581007281335.ttf and /dev/null differ
diff --git a/priv/static/static/font/fontello.1581007281335.woff2 b/priv/static/static/font/fontello.1581007281335.woff2
deleted file mode 100644
index 5bd824c7d..000000000
Binary files a/priv/static/static/font/fontello.1581007281335.woff2 and /dev/null differ
diff --git a/priv/static/static/font/fontello.1580306824221.eot b/priv/static/static/font/fontello.1581272100487.eot
similarity index 98%
rename from priv/static/static/font/fontello.1580306824221.eot
rename to priv/static/static/font/fontello.1581272100487.eot
index ecb4374e5..0fc4f848a 100644
Binary files a/priv/static/static/font/fontello.1580306824221.eot and b/priv/static/static/font/fontello.1581272100487.eot differ
diff --git a/priv/static/static/font/fontello.1580306824221.svg b/priv/static/static/font/fontello.1581272100487.svg
similarity index 100%
rename from priv/static/static/font/fontello.1580306824221.svg
rename to priv/static/static/font/fontello.1581272100487.svg
diff --git a/priv/static/static/font/fontello.1580306824221.ttf b/priv/static/static/font/fontello.1581272100487.ttf
similarity index 99%
rename from priv/static/static/font/fontello.1580306824221.ttf
rename to priv/static/static/font/fontello.1581272100487.ttf
index f53f8bd50..7d614ac8d 100644
Binary files a/priv/static/static/font/fontello.1580306824221.ttf and b/priv/static/static/font/fontello.1581272100487.ttf differ
diff --git a/priv/static/static/font/fontello.1581007281335.woff b/priv/static/static/font/fontello.1581272100487.woff
similarity index 98%
rename from priv/static/static/font/fontello.1581007281335.woff
rename to priv/static/static/font/fontello.1581272100487.woff
index f6e0f80fc..62f9a5931 100644
Binary files a/priv/static/static/font/fontello.1581007281335.woff and b/priv/static/static/font/fontello.1581272100487.woff differ
diff --git a/priv/static/static/font/fontello.1581272100487.woff2 b/priv/static/static/font/fontello.1581272100487.woff2
new file mode 100644
index 000000000..3001c5997
Binary files /dev/null and b/priv/static/static/font/fontello.1581272100487.woff2 differ
diff --git a/priv/static/static/fontello.1581007281335.css b/priv/static/static/fontello.1581007281335.css
deleted file mode 100644
index 2c747b4ae..000000000
Binary files a/priv/static/static/fontello.1581007281335.css and /dev/null differ
diff --git a/priv/static/static/fontello.1580306824221.css b/priv/static/static/fontello.1581272100487.css
similarity index 89%
rename from priv/static/static/fontello.1580306824221.css
rename to priv/static/static/fontello.1581272100487.css
index 5b032c779..f89a6a156 100644
Binary files a/priv/static/static/fontello.1580306824221.css and b/priv/static/static/fontello.1581272100487.css differ
diff --git a/priv/static/static/js/app.0aac253187b2af873849.js b/priv/static/static/js/app.0aac253187b2af873849.js
deleted file mode 100644
index 3f2f39e83..000000000
Binary files a/priv/static/static/js/app.0aac253187b2af873849.js and /dev/null differ
diff --git a/priv/static/static/js/app.0aac253187b2af873849.js.map b/priv/static/static/js/app.0aac253187b2af873849.js.map
deleted file mode 100644
index b2503292e..000000000
Binary files a/priv/static/static/js/app.0aac253187b2af873849.js.map and /dev/null differ
diff --git a/priv/static/static/js/app.1bb1c4f9614d2ee4144e.js b/priv/static/static/js/app.1bb1c4f9614d2ee4144e.js
new file mode 100644
index 000000000..ddca136fb
Binary files /dev/null and b/priv/static/static/js/app.1bb1c4f9614d2ee4144e.js differ
diff --git a/priv/static/static/js/app.1bb1c4f9614d2ee4144e.js.map b/priv/static/static/js/app.1bb1c4f9614d2ee4144e.js.map
new file mode 100644
index 000000000..0d73bab99
Binary files /dev/null and b/priv/static/static/js/app.1bb1c4f9614d2ee4144e.js.map differ
diff --git a/priv/static/static/js/app.6c9d89cde1a5896ed202.js b/priv/static/static/js/app.6c9d89cde1a5896ed202.js
deleted file mode 100644
index 8aca88126..000000000
Binary files a/priv/static/static/js/app.6c9d89cde1a5896ed202.js and /dev/null differ
diff --git a/priv/static/static/js/app.6c9d89cde1a5896ed202.js.map b/priv/static/static/js/app.6c9d89cde1a5896ed202.js.map
deleted file mode 100644
index 84bdb86e0..000000000
Binary files a/priv/static/static/js/app.6c9d89cde1a5896ed202.js.map and /dev/null differ
diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js
index d97e9544f..b65e603e4 100644
Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ