Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

2020-11-01 12:26:14 +00:00 · 2020-11-01 12:26:14 +00:00 · e21dd584a9
commit e21dd584a9
parent 3f8845bdad a84db4bd8f
169 changed files with 3933 additions and 1616 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,15 +4,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
-## [Unreleased patch]
+### Added
 - New option to optimize timeline rendering to make the site more responsive (enabled by default)
 ## [Unreleased patch]
 ### Fixed
 - Fixed chats list not updating its order when new messages come in
 - Fixed chat messages sometimes getting lost when you receive a message at the same time
 - Fixed clicking NSFW hider through status popover
 ### Added
 - Import/export a muted users
 - Proper handling of deletes when using websocket streaming
 ## [2.1.1] - 2020-09-08
 ### Changed
 - Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
 ### Fixed
 - Network fetches don't pile up anymore but wait for previous ones to finish to reduce throttling.
 - Autocomplete won't stop at the second @, so it'll still work with "@lain@l" and not start over.
 - Fixed weird autocomplete behavior when you write ":custom_emoji: ?"
 ## [2.1.0] - 2020-08-28
 ### Added
 - Autocomplete domains from list of known instances
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@ -3,7 +3,6 @@ var config = require('../config')
 var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
 var ServiceWorkerWebpackPlugin = require('serviceworker-webpack-plugin')
 var FontelloPlugin = require("fontello-webpack-plugin")
 var env = process.env.NODE_ENV
 // check env & config/index.js to decide weither to enable CSS Sourcemaps for the
@ -94,14 +93,6 @@ module.exports = {
    new ServiceWorkerWebpackPlugin({
      entry: path.join(__dirname, '..', 'src/sw.js'),
      filename: 'sw-pleroma.js'
    }),
    new FontelloPlugin({
      config: require('../static/fontello.json'),
      name: 'fontello',
      output: {
        css: 'static/[name].' + now + '.css',  // [hash] is not supported. Use the current timestamp instead for versioning.
        font: 'static/font/[name].' + now + '.[ext]'
      }
    })
  ]
 }
--- a/docs/CONFIGURATION.md
+++ b/docs/CONFIGURATION.md
@ -1,13 +1,13 @@
 # Pleroma-FE configuration and customization for instance administrators
-* *For user configuration, see [Pleroma-FE user guide](USER_GUIDE.md)*
+* *For user configuration, see [Pleroma-FE user guide](../user_guide)*
 * *For local development server configuration, see [Hacking, tweaking, contributing](HACKING.md)*
 ## Where configuration is stored
 PleromaFE gets its configuration from several sources, in order of preference (the one above overrides ones below it)
-1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, PleromaFE uses `pleromafe` field of it. For more info on changing config on BE, look [here](https://docs-develop.pleroma.social/config.html#frontend_configurations)
+1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, PleromaFE uses `pleromafe` field of it. For more info on changing config on BE, look [here](../backend/configuration/cheatsheet.md#frontend_configurations)
 2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/static/config.json).
 3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/modules/instance.js) )
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@ -25,7 +25,7 @@ This could be a bit trickier, you basically need steps 1-4 from *develop build*
 ### Replacing your instance's frontend with custom FE build
-This is the most easiest way to use and test FE build: you just need to copy or symlink contents of `dist` folder into backend's [static directory](https://docs.pleroma.social/static_dir.html), by default it is located in `instance/static`, or in `/var/lib/pleroma/static` for OTP release installations, create it if it doesn't exist already. Be aware that running `yarn build` wipes the contents of `dist` folder.
+This is the most easiest way to use and test FE build: you just need to copy or symlink contents of `dist` folder into backend's [static directory](../backend/configuration/static_dir.md), by default it is located in `instance/static`, or in `/var/lib/pleroma/static` for OTP release installations, create it if it doesn't exist already. Be aware that running `yarn build` wipes the contents of `dist` folder.
 ### Running production build locally or on a separate server
@ -67,9 +67,9 @@ server {
 ### API, Data, Operations
-In 99% cases PleromaFE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](https://docs-develop.pleroma.social/differences_in_mastoapi_responses.html) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure.
+In 99% cases PleromaFE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](../backend/API/differences_in_mastoapi_responses.md) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure.
-PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.
+PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.
 For most part, PleromaFE tries to store all the info it can get in global vuex store - every user and post are passed trough updating mechanism where data is either added or merged with existing data, reactively updating the information throughout UI, so if in newest request user's post counter increased, it will be instantly updated in open user profile cards. This is also used to find users, posts and sometimes to build timelines and/or request parameters.
--- a/docs/USER_GUIDE.md
+++ b/docs/USER_GUIDE.md
@ -1,207 +0,0 @@
 # Pleroma-FE user guide
 > Be prepared for breaking changes, unexpected behavior and this user guide becoming obsolete and wrong.
 > If there was no insanity
 >
 > it would be necessary to create it.
 >
 > --Catbag
 ## Posting, reading, basic functions.
 After registering and logging in you're presented with your timeline in right column and new post form with timeline list and notifications in the left column.
 Posts will contain the text you are posting, but some content will be modified:
 1. Mentions: Mentions have the form of @user or @user<span></span>@instance.tld. These will become links to the user's profile. In addition, the mentioned user will always get a notification about the post they have been mentioned in, so only mention users that you want to receive this message.
 2. URLs: URLs like `http://example.com` will be automatically  be turned into a clickable links.
 3. Hashtags: Hashtags like #cofe will also be turned into links.
 **Depending on your instance some of the options might not be available or have different defaults**
 Let's clear up some basic stuff. When you post something it's called a **post** or it could be called a **status** or even a **toot** or a **prööt** depending on whom you ask. Post has body/content but it also has some other stuff in it - from attachments, visibility scope, subject line.
 * **Emoji** are small images embedded in text, there are two major types of emoji: [unicode emoji](https://en.wikipedia.org/wiki/Emoji) and custom emoji. While unicode emoji are universal and standardized, they can appear differently depending on where you are using them or may not appear at all on older systems. Custom emoji are more *fun* kind - instance administrator can define many images as *custom emoji* for their users. This works very simple - custom emoji is defined by its *shortcode* and an image, so that any shortcode enclosed in colons get replaced with image if such shortcode exist.
 Let's say there's `:pleroma:` emoji defined on instance. That means  
 > First time using :pleroma: pleroma!  
 will become  
 > First time using ![pleroma](./example_emoji.png) pleroma!  
 Note that you can only use emoji defined on your instance, you cannot "copy" someone else's emoji, and will have to ask your administrator to copy emoji from other instance to yours.  
 Lastly, there's two convenience options for emoji: an emoji picker (smiley face to the right of "submit" button) and autocomplete suggestions - when you start typing :shortcode: it will automatically try to suggest you emoj and complete the shortcode for you if you select one. **Note** that if emoji doesn't show up in suggestions nor in emoji picker it means there's no such emoji on your instance, if shortcode doesn't match any defined emoji it will appear as text.
 * **Attachments** are fairly simple - you can attach any file to a post as long as the file is within maximum size limits. If you're uploading explicit material you can mark all of your attachments as sensitive (or add `#nsfw` tag) - it will hide the images and videos behind a warning so that it won't be displayed instantly.
 * **Subject line** also known as **CW** (Content Warning) could be used as a header to the post and/or to warn others about contents of the post having something that might upset somebody or something among those lines. Several applications allow to hide post content leaving only subject line visible. Using a subject line will not mark your images as sensitive, you will have to do that explicitly (see above).
 * **Visiblity scope** controls who will be able to see your posts. There are four scopes available:
 1. `Public`: This is the default, and some fediverse software like GNU Social only supports this. This means that your post is accessible by anyone and will be shown in the public timelines.
 2. `Unlisted`: This is the same as public, but your post won't appear in the public timelines. The post will still be accessible by anyone who comes across it (for example, by looking at your profile) or by direct linking. They will also appear in public searches.
 3. `Followers only`: This will show your post only to your followers. Only they will be able to interact with it. Be careful: When somebody follows you, they will be able to see all your previous `followers only` posts as well! If you want to restrict who can follow you, consider [locking your account down to only approved followers](#profle).
 4. `Direct`: This will only send the message to the people explicitly mentioned in the post.
 A few things to consider about the security and usage of these scopes:
 - None of these options will change the fact that the messages are all saved in the database unencrypted. They will be visible to your server admin and to any other admin of a server who receives this post. Do not share information that you would consider secret or dangerous. Use encrypted messaging systems for these things.
 - Follower-only posts can lead to fragmented conversations. If you post a follower-only post and somebody else replies to it with a follower-only post, only people following both of you will see the whole conversation thread. Everybody else will only see half of it. Keep this in mind and keep conversations public if possible.
 - Changing scopes during a thread or adding people to a direct message will not retroactively make them see the whole conversation. If you add someone to a direct message conversation, they will not see the post that happened before they were mentioned.
 * **Reply-to** if you are replying to someone, your post will also contain a note that your post is referring to the post you're replying to. Person you're replying to will receive a notification *even* if you remove them from mentioned people. You won't receive notifications when replying to your own posts, but it's useful to reply to your own posts to provide people some context if it's a follow-up to a previous post. There's a small "Reply to ..." label under post author's name which you can hover on to see what post it's referring to.
 Sometimes you may encounter posts that seem different than what they are supposed to. For example, you might see a direct message without any mentions in the text. This can happen because internally, the Fediverse has a different addressing mechanism similar to email, with `to` and `cc` fields. While these are not directly accessible in PleromaFE, other software in the Fediverse might generate those posts. Do not worry in these cases, these are normal and not a bug.
 #### Rich text
 By default new posts you make are plaintext, meaning you can't make text **bold** or add custom links or make lists or anything like that. However if your instance allows it you can use Markdown or BBCode or HTML to spice up your text, however there are certain limitations to what HTML tags and what features of Markdown you can use.
 this section will be expanded later
 ### Other actions
 In addition to posting you can also *favorite* post also known as *liking* them and *repeat* posts (also known as *retweeting*, *boosting* and even *reprööting*). Favoriting a post increments a counter on it, notifies post author of your affection towards that post and also adds that post to your "favorited" posts list (in your own profile, "Favorites" tab). Reprööting a post does all that and also repeats this post to your followers and your profile page with a note "*user* repeated post".
 Your own posts can be deleted, but this will only reliably delete the post from your own instance. Other instances will receive a deletion notice, but there's no way to force them to actually delete a post. In addition, not all instances that contain the message might even receive the deletion notice, because they might be offline or not known to have the post because they received it through a repeat. Lastly, deletion notice might not reach certain frontends and clients - post will be visible for them until page refresh or cache clear, they probably won't be able to interact with it apart from replying to it (which will have reply-to mark missing).
 If you are a moderator, you can also delete posts by other people. If those people are on your instance, it will delete the post and send out the deletion notice to other servers. If they are not on your instance, it will just remove the post from your local instance.
 There's also an option to report a user via a post (if the feature is available on your instance) which could be used to notify your (and probably other instance's) admin that someone is being naughty.
 ## Users
 When you see someone, you can click on their user picture to view their profile, and click on the userpic in that to see *full* profile. You can *follow* them, *mute* and *block* them. Following is self-explanatory, it adds them t your Home Timeline, lists you as a follower and gives you access to follower-only posts if they have any. Muting makes posts and notifications made by them very tiny, giving you an option to see the post if you're curious. However on clients other than PleromaFE their posts will be completely removed. *Blocking* a user removes them from your timeline and notifications and prevents them from following you (automatically unfollows them from you).
 Please note that some users can be "locked", meaning instead of following them you send a follow request they need to approve for you to become their follower.
 ## Timelines
 Currently you have several timelines to browse trough:
 * **Timeline** aka Home Timeline - this timeline contains all posts by people you follow and your own posts, as well as posts mentioning you directly.
 * **Interactions** all interactions you've had with people on the network, basically same as notifications except grouped in convenient way - mentions separate from favorites with repeats separate from follows
 * **Direct Messages** all posts with `direct` scope addressed to you or mentioning you.
 * **Public Timelines** all posts made by users on instance you're on
 * **The Whole Known Network** also known as **TWKN** or **Federated Timeline** - all posts on the network by everyone, almost. Due to nature of the network your instance may not know *all** the instances on the network, so only posts originating from known instances are shown there.
 ## Your profile
 By clicking wrench icon above the post form you can access the profile edit or "user settings" screen.
 ### Profle
 Here you can set up how you appear to other users among with some other settings:
 - Name: this is text that displays next to your avatar in posts. Please note that you **cannot** change your *@<span></span>handle*
 - Bio: this will be displayed under your profile - you can put anything you want there you want for everyone to see.
 - Restrict your account to approved followers only: this makes your account "locked", when people follow you - you have to approve or deny their follow requests, this gives more control over who sees your followers only posts.
 - Default visibility scope: this chooses your default post scope for new posts
 - Strip rich text from all posts: this strips rich text formatting (bold/italics/lists etc) from all incoming posts. Will only affect newly fetched posts.
 If you're admin or moderator on your instance you also get "Show [role] badge in my profile" - this controls whether to show "Admin" or "Moderator** label on your profile page.
 **For all options mentioned above you have to click "Submit" button for changes to take place**
 - Avatar: this changes picture next to your posts. Your avatar shouldn't exceed 2 MiB (2097152 bytes) or it could cause problems with certain instances.
 - Banner: this changes background on your profile card. Same as avatar it shouldn't exceed 2 MiB limit.
 - Profile Background: this changes background picture for UI. It isn't shown to anyone else **yet**, but some time later it will be shown when viewing your profile.
 ### Security
 Here you can change your password, revoke access tokens, configure 2-factor authentication (if available).
 ### Notifications
 This screen allows more fine-grained control over what notifications to show to you based on whom it comes from
 ### Data Import/Export
 This allows you to export and import a list of people you follow, in case instance's database gets reverted or if you want to move to another server. Note that you **CANNOT export/import list of people who *follow you***, they'll just need to follow you back after you move.
 ### Blocks and Mutes
 These screens give access to full list of people you block/mute, useful for *un*blocking/*un*muting people because blocking/muting them most likely removes them out of your sight completely.
 ## Other stuff
 By default you can see **ALL** posts made by other users on your Home Timeline, this contrast behavior of Twitter and Mastodon, which shows you only non-reply posts and replies to people you follow. You can set it up to replicate the said behavior, however the option is currently broken.
 You can view other people's profiles and search for users (top-right corner, person with a plus icon). Tag search is possible but not implemented properly yet, right now you can click on tag link in a post to see posts tagged with that post.
 You can also view posts you've favorited on your own profile, but you cannot see favorites by other people.
 Due to nature of how Pleroma (backend) operates you might see old posts appear as if they are new, this is because instance just learned about that post (i.e. your instance is younger that some other ones) and someone interacted with old post. Posts are sorted by date of when they are received, not date they have been posted because it's very easy to spoof the date, so a post claiming it "was" made in year 2077 could hand at top of your TL forever.
 # Customization and configuration
 Clicking on the cog icon in the upper right will go to the settings screen.
 ## General
 ### Interface
 - Language: Here you can set the interface language. The default language is the one that you set in your browser settings.
 - Hide instance-specific panel: This hides the panel in the lower left that usually contains general information about the server.
 ### Timeline
 - Hide posts of muted users: If this is set, 'muting' a user will completely hide their posts instead of collapsing them.
 - Collapse posts with subjects: This will collapse posts that contain a subject, hiding their content. Subjects are also sometimes called content warnings.
 - Enable automatic streaming of new posts when scrolled to the top: With this enabled, new posts will automatically stream in when you are scrolled to the top. Otherwise, you will see a button on the timeline that will let you display the new posts.
 - Pause streaming when tab is not focused: This pauses the automatic streaming that the previous option enables when the tab is out of focus. This is useful if you don't want to miss any new posts.
 - Enable automatic loading when scrolled to the bottom: When this is disabled, a button will be shown on the bottom of the timeline that will let you load older posts.
 - Enable reply-link preview on hover: Status posts in the timeline and notifications contain links to replies and to the post they are a reply to. If this setting is enabled, hovering over that link will display that linked post in a small hovering overlay.
 ### Composing
 - Copy scope when replying: When this is activated, the scope of a reply will be the same as the scope of the post it is replying to. This is useful to prevent accidentally moving private discussions to public, or vice versa.
 - Always show subject field: Whether or not to display the 'subject' input field in the post form. If you do not want to use subjects, you can deactivate this.
 - Copy subject when replying: This controls if the subject of a post will be copied from the post it is replying to.
 - Post status content type: Selects the default content type of your post. The options are: Plain text, HTML, BBCode and Markdown.
 - Minimize scope selection options: Selecting this will reduce the visibility scopes to 'direct', your default post scope and post scope of post you're replying to.
 - Automatically hide New Post button: Mobile interface only: hide floating "New post" button when scrolling
 ### Attachments
 - Hide attachments in timeline: Do not display attachments in timelines. They will still display in expanded conversations. This is useful to save bandwidth and for browsing in public.
 - Hide attachments in conversations: Also hide attachments in expanded conversations.
 - Maximum amount of thumbnails per post: Exactly that :)
 - Enable clickthrough NSFW attachment hiding: Hide attachments that are marked as NSFW/sensitive behind a click-through image.`
 - Preload images: This will preload the hidden images so that they display faster when clicking through.
 - Open NSFW attachments with just one click: Directly open NSFW attachments in a maximised state instead of revealing the image thumbnail.
 - Play-on-hover GIFs: With this activated, GIFs images and avatars will only be animated on mouse hover. Otherwise, they will be always animated. This is very useful if your timeline looks too flashy from people's animated avatars and eases the CPU load.
 - Loop videos: Whether to loop videos indefinitely.
 - Loop only videos without sound: Some instances will use videos without sounds instead of GIFs. This will make only those videos autoplay.
 - Play videos directly in the media viewer: Play videos right in the timeline instead of opening it in a modal
 - Don't crop the attachment in thumbnails: if enabled, images in attachments will be fit entirely inside the container instead of being zoomed in and cropped.
 ### Notifications
 - Enable web push notifications: this enables Web Push notifications, to allow receiving notifications even when the page isn't opened, doesn't affect regular notifications.
 ## Theme
 You can change the look and feel of Pleroma Frontend here. You can choose from several instance-provided presets and you can load one from file and save current theme to file. Before you apply new theme you can see what it will look like approximately in preview section.
 Themes engine was made to be easy to use while giving an option for powerful in-depth customization - you can just tweak colors on "Common" tab and leave everything else as is.
 If there's a little check box next to a color picker it means that color is optional and unless checked will be automatically picked based on some other color or defaults.
 For some features you can also adjust transparency of it by changing its opacity, you just need to tick checkbox next to it, otherwise it will be using default opacity.
 Contrast information is also provided - you can see how readable text is based on contrast between text color and background, icons under color pickers represent contrast rating based on [WCAG](https://www.w3.org/TR/2008/REC-WCAG20-20081211/#visual-audio-contrast-contrast) - thumbs up means AAA rating (good), half-filled circle means AA rating (acceptable) and warning icon means it doesn't pass the minimal contrast requirement and probably will be less readable, especially for vision-challenged people, you can hover over icon to see more detailed information. *Please note* that if background is not opaque (opacity != 1) contrast will be measured based on "worst case scenario", i.e. behind semi-transparent background lies some solid color that makes text harder to read, this however is still inaccurate because it doesn't account that background can be noisy/busy, making text even harder to read.
 Apart from colors you can also tweak shadow and lighting, which is used mostly to give buttons proper relief based on their state, give panes their shade, make things glow etc. It's quite powerful, and basically provides somewhat convenient interface for [CSS Shadows](https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow).
 Another thing you can tweak is theme's roundness - some people like sharp edges, some want things more rounded. This is also used if you want circled or square avatars.
 Lastly, you can redefine fonts used in UI without changing fonts in your browser or system, this however requires you to enter font's full name and having that font installed on your system.
 ## Filtering
 - Types of notifications to show: This controls what kind of notifications will appear in notification column and which notifications to get in your system outside the web page
 - Replies in timeline: You may know that other social networks like Twitter will often not display replies to other people in your timeline, even if you are following the poster. Pleroma usually will show these posts to you to encourage conversation. If you do not like this behavior, you can change it here.
 - Hide post statistics: This hides the number of favorites, number of replies, etc.
 - Hide user statistics: This hides the number of followers, friends, etc.
 - Muted words: A list of words that will be muted (i.e. displayed in a collapsed state) on the timeline and in notifications. An easy way to tune down noise in your timeline. Posts can always be expanded when you actually want to see them.
 - Hide filtered statuses: Selecting this will hide the filtered / muted posts completely instead of collapsing them.
 ## Version
 Just displays the backend and frontend version. Useful to mention in bug reports.
--- a/docs/assets/example_emoji.png
+++ b/docs/assets/example_emoji.png
--- a/docs/assets/example_markdown.png
+++ b/docs/assets/example_markdown.png
--- a/docs/index.md
+++ b/docs/index.md
@ -5,4 +5,4 @@ Pleroma-FE is the default user-facing frontend for Pleroma. It's user interface
 ## How can I use it?
-If your instance uses Pleroma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Pleroma-FE User Guide](./USER_GUIDE.md). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).
+If your instance uses Pleroma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Pleroma-FE User Guide](./user_guide/). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).
--- a/docs/user_guide/index.md
+++ b/docs/user_guide/index.md
@ -0,0 +1,44 @@
 # General overview
 > Be prepared for breaking changes, unexpected behavior and this user guide becoming obsolete and wrong.
 > If there was no insanity
 >
 > it would be necessary to create it.
 >
 > --Catbag
 Pleroma-FE is the default user-facing frontend for Pleroma. If your instance uses Pleroma-FE, you can access it by going to your instance (e.g. <https://pleroma.soykaf.com>). After logging in you will have two columns in front of you. Here we're going to keep it to the default behaviour, but some instances swap the left and right columns. If you're on such an instance what we refer to as the left column will be on your right and vice versa.
 ### Left column
 - first block: This section is dedicated to [posting](posting_reading_basic_functions.md)
 - second block: Here you can switch between the different views for the right column.
 - Optional third block: This is the Instance panel that can be activated, but is deactivated by default. It's fully customisable by instance admins and by default has links to the Pleroma-FE and Mastodon-FE.
 - fourth block: This is the Notifications block, here you will get notified whenever somebody mentions you, follows you, repeats or favorites one of your statuses
 ### Right column
 This is where the interesting stuff happens! There are different views depending on what you choose in the second block of the left panel.
 - **Timelines** Depending on the [timeline](timelines.md) you will see different statuses, but each status has a standard structure:
    - Profile pic, name and link to profile. An optional left-arrow if it's a reply to another status (hovering will reveal the reply-to status). Clicking on the profile pic will uncollapse the user's profile where you can find information about the account and can [follow, mute or block the account](users_follow_mute_block.md).
    - An arrow icon on the right side allows you to open the status on the instance where it's originating from.
    - A `+` button on the rightmost side allows you to Expand/Collapse an entire discussion thread.
    - The text of the status, including mentions and attachments. If you click on a mention, it will automatically open the profile page of that person.
    - Four buttons (left to right): Reply, Repeat, Favorite and Add Reaction. The three dots next to it are a dropdown menu for extra options including simple moderation, bookmarking, deleting posts, pinning your own posts to your profile and more.
 - **Interactions** shows all interactions you've had with people on the network, basically same as notifications except grouped in convenient way.
 - **Chats** is the chat feature. You can find your friends and start chatting with them. At the moment chat are only one-on-one, but once groups are introduced groupchats will also be possible.
 - **About** is the about-page and lists the staff, the TOS, activated MRF's, and enabled features
 ### Top right
 - The magnifier icon opens the search screen
    - You can search for statuses, people and hashtags.
    - You can import statuses from remote servers by pasting the url to the post in the search field.
    - If you want to search for users that your instance doesn't know about yet, you can search for them using the full `name@instance.tld` handle. You can also use the full url from their remote profile.
 - The gear icon gives you [settings](settings.md)
 - If you have admin rights, you'll see an icon that opens the admin interface
 - The last icon is to log out
 ### Bottom right
 On the bottom right you have the Shoutbox. Here you can communicate with people on the same instance in realtime. It is local-only, very basic and will most probably be removed once the Chats functionality allows group chats.
--- a/docs/user_guide/posting_reading_basic_functions.md
+++ b/docs/user_guide/posting_reading_basic_functions.md
@ -0,0 +1,76 @@
 # Posting, reading, basic functions.
 !!! warning
    Depending on your instance some of the options might not be available or have different defaults
 After registering and logging in you're presented with your timeline in right column and new post form with timeline list and notifications in the left column.
 Posts will contain the text you are posting, but some content will be modified:
 1. Mentions: Mentions have the form of @user or @user<span></span>@instance.tld. These will become links to the user's profile. In addition, the mentioned user will always get a notification about the post they have been mentioned in, so only mention users that you want to receive this message.
 2. URLs: URLs like `http://example.com` will be automatically  be turned into a clickable links.
 3. Hashtags: Hashtags like #cofe will also be turned into links.
 4. There is a default character limit of 5000 characters.
 Let's clear up some basic stuff. When you post something it's called a **post** or it could be called a **status** or even a **toot** or a **prööt** depending on whom you ask. Post has body/content but it also has some other stuff in it - from attachments, visibility scope, subject line...
 **Emoji** are small images embedded in text, there are two major types of emoji: [unicode emoji](https://en.wikipedia.org/wiki/Emoji) and custom emoji. While unicode emoji are universal and standardized, they can appear differently depending on where you are using them or may not appear at all on older systems. Custom emoji are a more *fun* kind - instance administrator can define many images as *custom emoji* for their users. This works very simple - custom emoji is defined by its *shortcode* and an image, so that any shortcode enclosed in colons get replaced with image if such shortcode exist.
 Let's say there's a `:pleroma:` emoji defined on an instance. That means  
 > First time using :pleroma: pleroma!  
 will become  
 > First time using ![pleroma](../assets/example_emoji.png) pleroma!  
 Note that you can only use emoji defined on your instance, you cannot "copy" someone else's emoji, and will have to ask your administrator to copy emoji from other instance to yours.  
 Lastly, there's two convenience options for emoji: an emoji picker (smiley face to the right of "submit" button) and autocomplete suggestions - when you start typing :shortcode: it will automatically try to suggest you emoji and complete the shortcode for you if you select one. If emoji doesn't show up in suggestions nor in emoji picker it means there's no such emoji on your instance, if shortcode doesn't match any defined emoji it will appear as text.
 **Attachments** are fairly simple - you can attach any file to a post as long as the file is within maximum size limits. If you're uploading explicit material you can mark all of your attachments as sensitive (or add the `#nsfw` tag) - it will hide the images and videos behind a warning so that it won't be displayed instantly.
 **Subject line** also known as **CW** (Content Warning) could be used as a header to the post and/or to warn others about contents of the post having something that might upset somebody or something among those lines. Several applications allow to hide post content leaving only subject line visible. Using a subject line will not mark your images as sensitive, you will have to do that explicitly (see above).
 **Visiblity scope** controls who will be able to see your posts. There are four scopes available:
 1. `Public`: This is the default, and some fediverse software, like GNU Social, only supports this. This means that your post is accessible by anyone and will be shown in the public timelines.
 2. `Unlisted`: This is the same as public, but your post won't appear in the public timelines. The post will still be accessible by anyone who comes across it (for example, by looking at your profile) or by direct linking. They will also appear in public searches.
 3. `Followers only`: This will show your post only to your followers. Only they will be able to interact with it. Be careful: When somebody follows you, they will be able to see all your previous `followers only` posts as well! If you want to restrict who can follow you, consider [locking your account down to only approved followers](../settings#profile).
 4. `Direct`: This will only send the message to the people explicitly mentioned in the post.
 A few things to consider about the security and usage of these scopes:
 - None of these options will change the fact that the messages are all saved in the database unencrypted. They will be visible to your server admin and to any other admin of a server who receives this post. Do not share information that you would consider secret or dangerous. Use encrypted messaging systems for these things.
 - Follower-only posts can lead to fragmented conversations. If you post a follower-only post and somebody else replies to it with a follower-only post, only people following both of you will see the whole conversation thread. Everybody else will only see half of it. Keep this in mind and keep conversations public if possible.
 - Changing scopes during a thread or adding people to a direct message will not retroactively make them see the whole conversation. If you add someone to a direct message conversation, they will not see the post that happened before they were mentioned.
 * **Reply-to** if you are replying to someone, your post will also contain a note that your post is referring to the post you're replying to. Person you're replying to will receive a notification *even* if you remove them from mentioned people. You won't receive notifications when replying to your own posts, but it's useful to reply to your own posts to provide people some context if it's a follow-up to a previous post. There's a small "Reply to ..." label under post author's name which you can hover on to see what post it's referring to.
 Sometimes you may encounter posts that seem different than what they are supposed to. For example, you might see a direct message without any mentions in the text. This can happen because internally, the Fediverse has a different addressing mechanism similar to email, with `to` and `cc` fields. While these are not directly accessible in PleromaFE, other software in the Fediverse might generate those posts. Do not worry in these cases, these are normal and not a bug.
 ## Rich text
 By default new posts you make are plaintext, meaning you can't make text **bold** or add custom links or make lists or anything like that. However if your instance allows it you can use Markdown or BBCode or HTML to spice up your text, however there are certain limitations to what HTML tags and what features of Markdown you can use.
 Here is a small example of some text in markdown.
 ```
 This is an example of markdown text using **bold** and *cursive* text.  
 To get a newline we add two spaces at the end of the previous line.
 Let's also add a list
 * with
 * some
 * items
 ```
 If you set the input-method to Markdown, and post this, it will look something like
 ![example_markdown](../assets/example_markdown.png)
 ## Other actions
 In addition to posting you can also *favorite* posts also known as *liking* them and *repeat* posts (also known as *retweeting*, *boosting* and even *reprööting*). Favoriting a post increments a counter on it, notifies the post author of your affection towards that post and also adds that post to your "favorited" posts list (in your own profile, "Favorites" tab). Reprööting a post does all that and also repeats this post to your followers and your profile page with a note "*user* repeated post".
 Your own posts can be deleted, but this will only reliably delete the post from your own instance. Other instances will receive a deletion notice, but there's no way to force them to actually delete a post. In addition, not all instances that contain the message might even receive the deletion notice, because they might be offline or not known to have the post because they received it through a repeat. Lastly, deletion notice might not reach certain frontends and clients - post will be visible for them until page refresh or cache clear, they probably won't be able to interact with it apart from replying to it (which will have reply-to mark missing).
 If you are a moderator, you can also delete posts by other people. If those people are on your instance, it will delete the post and send out the deletion notice to other servers. If they are not on your instance, it will just remove the post from your local instance.
 There's also an option to report a user's post which can be used to notify your (and optionally the other instance's) admin that someone is being naughty.
--- a/docs/user_guide/settings.md
+++ b/docs/user_guide/settings.md
@ -0,0 +1,116 @@
 # Settings
 On the top-right you will see a gear icon. Click it to open the settings.
 ## General
 ### Interface
 - **Interface language** is where you can set the interface language. The default language is the one that you set in your browser settings.
 - **Hide instance-specific panel** hides the panel in the lower left that usually contains general information about the server. This will only be visible if your admin has activated this panel and is deactivated by default.
 ### Timeline
 - **Hide posts of muted users** If this is set, 'muting' a user will completely hide their posts instead of collapsing them.
 - **Collapse posts with subjects** This will collapse posts that contain a subject, hiding their content. Subjects are also sometimes called content warnings.
 - **Enable automatic streaming of new posts when scrolled to the top** With this enabled, new posts will automatically stream in when you are scrolled to the top. Otherwise, you will see a button on the timeline that will let you display the new posts.
 - **Pause streaming when tab is not focused** This pauses the automatic streaming that the previous option enables when the tab is out of focus. This is useful if you don't want to miss any new posts.
 - **Enable automatic loading when scrolled to the bottom** When this is disabled, a button will be shown on the bottom of the timeline that will let you load older posts.
 - **Enable reply-link preview on hover** Status posts in the timeline and notifications contain links to replies and to the post they are a reply to. If this setting is enabled, hovering over that link will display that linked post in a small hovering overlay.
 ### Composing
 - **Copy scope when replying** makes the scope of a reply be the same as the scope of the post it is replying to. This is useful to prevent accidentally moving private discussions to public, or vice versa.
 - **Always show subject field** Whether or not to display the 'subject' input field in the post form. If you do not want to use subjects, you can deactivate this.
 - **Copy subject when replying** controls if the subject of a post will be copied from the post it is replying to.
 - **Post status content type** selects the default content type of your post. The options are: Plain text, HTML, BBCode and Markdown.
 - **Minimize scope selection options** will reduce the visibility scopes to 'direct', your default post scope and post scope of post you're replying to.
 - **Automatically hide New Post button** hides the floating "New post" button when scrolling on mobile view.
 - **Pad emoji with spaces when adding from picker** Will add spaces around emoji you select it from the picker.
 ### Attachments
 - **Hide attachments in timeline** Do not display attachments in timelines. They will still display in expanded conversations. This is useful to save bandwidth and for browsing in public.
 - **Hide attachments in conversations** Also hide attachments in expanded conversations.
 - **Maximum amount of thumbnails per post** Exactly that :)
 - **Enable clickthrough NSFW attachment hiding** Hide attachments that are marked as NSFW/sensitive behind a click-through image.`
    - **Preload images** This will preload the hidden images so that they display faster when clicking through.
    - **Open NSFW attachments with just one click** Directly open NSFW attachments in a maximised state instead of revealing the image thumbnail.
 - **Play-on-hover GIFs** With this activated, GIFs images and avatars will only be animated on mouse hover. Otherwise, they will be always animated. This is very useful if your timeline looks too flashy from people's animated avatars and eases the CPU load.
 - **Loop videos** Whether to loop videos indefinitely.
    - **Loop only videos without sound** Some instances will use videos without sounds instead of GIFs. This will make only those videos autoplay.
 - **Play videos directly in the media viewer** Play videos right in the timeline instead of opening it in a modal
 - **Don't crop the attachment in thumbnails** if enabled, images in attachments will be fit entirely inside the container instead of being zoomed in and cropped.
 ### Notifications
 - **Enable web push notifications** this enables Web Push notifications, to allow receiving notifications even when the page isn't opened, doesn't affect regular notifications.
 ### Fun
 - **Meme arrows** will make `> greentext` be shown in green (using the "green" from the theme that is used).
 ## Profile
 Here you can set up how you appear to other users among with some other settings:
 - **Name** is text that displays next to your avatar in posts. Please note that you **cannot** change your *@handle*
 - **Bio** will be displayed under your profile - you can put anything you want there you want for everyone to see.
 - **Restrict your account to approved followers only** makes your account "locked", when people follow you - you have to approve or deny their follow requests, this gives more control over who sees your followers only posts.
 - **Default visibility scope** is your default post scope for new posts
 - **Strip rich text from all posts** strips rich text formatting (bold/italics/lists etc) from all incoming posts. This will only affect newly fetched posts.
 If you're admin or moderator on your instance you also get **Show [role] badge in my profile** - this controls whether to show "Admin" or "Moderator** label on your profile page.
 **For all options mentioned above you have to click "Submit" button for changes to take place**
 - **Avatar** this changes picture next to your posts. Your avatar shouldn't exceed 2 MiB (2097152 bytes) or it could cause problems with certain instances.
 - **Banner** this changes background on your profile card. Same as avatar it shouldn't exceed 2 MiB limit.
 - **Profile Background** this changes background picture for UI. It isn't shown to anyone else *yet*, but some time later it will be shown when viewing your profisle.
 ## Security
 Here you can change your password, revoke access tokens, configure 2-factor authentication (if available).
 ## Filtering
 - **Types of notifications to show** This controls what kind of notifications will appear in notification column and which notifications to get in your system outside the web page
 - **Replies in timeline** You may know that other social networks like Twitter will often not display replies to other people in your timeline, even if you are following the poster. Pleroma usually will show these posts to you to encourage conversation. If you do not like this behavior, you can change it here.
 - **Hide post statistics** This hides the number of favorites, number of replies, etc.
 - **Hide user statistics** This hides the number of followers, friends, etc.
 - **Muted words** allows a list of words that will be muted (i.e. displayed in a collapsed state) on the timeline and in notifications. An easy way to tune down noise in your timeline. By default posts can be expanded if you want to see them.
 - **Hide filtered statuses** will hide the filtered / muted posts completely instead of collapsing them.
 ## Theme
 Here you can change the look and feel of Pleroma-FE. You can choose from several instance-provided presets and you can load one from file and save current theme to file. Before you apply new theme you can see what it will look like approximately in preview section.
 The themes engine was made to be easy to use while giving an option for powerful in-depth customization - you can just tweak colors on "Common" tab and leave everything else as is.
 If there's a little check box next to a color picker it means that color is optional and unless checked will be automatically picked based on some other color or defaults.
 For some features you can also adjust transparency of it by changing its opacity, you just need to tick checkbox next to it, otherwise it will be using default opacity.
 Contrast information is also provided - you can see how readable text is based on contrast between text color and background, icons under color pickers represent contrast rating based on [WCAG](https://www.w3.org/TR/2008/REC-WCAG20-20081211/#visual-audio-contrast-contrast) - thumbs up means AAA rating (good), half-filled circle means AA rating (acceptable) and warning icon means it doesn't pass the minimal contrast requirement and probably will be less readable, especially for vision-challenged people, you can hover over icon to see more detailed information. *Please note* that if background is not opaque (opacity != 1) contrast will be measured based on "worst case scenario", i.e. behind semi-transparent background lies some solid color that makes text harder to read, this however is still inaccurate because it doesn't account that background can be noisy/busy, making text even harder to read.
 Apart from colors you can also tweak shadow and lighting, which is used mostly to give buttons proper relief based on their state, give panes their shade, make things glow etc. It's quite powerful, and basically provides somewhat convenient interface for [CSS Shadows](https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow).
 Another thing you can tweak is theme's roundness - some people like sharp edges, some want things more rounded. This is also used if you want circled or square avatars.
 Lastly, you can redefine fonts used in UI without changing fonts in your browser or system, this however requires you to enter font's full name and having that font installed on your system.
 ## Notifications
 This screen allows more fine-grained control over what notifications to show to you based on whom it comes from.
 ## Data Import/Export
 This allows you to export and import a list of people you follow and block, in case instance's database gets reverted or if you want to move to another server. Note that you **CANNOT export/import list of people who *follow you***, they'll need to follow you back themselves.
 ## Mutes and Blocks
 These screens give access to full list of people you block/mute, useful for *un*blocking/*un*muting people because blocking/muting them most likely removes them out of your sight completely.
 ## Version
 Just displays the backend and frontend version. Useful to mention in bug reports.
--- a/docs/user_guide/timelines.md
+++ b/docs/user_guide/timelines.md
@ -0,0 +1,13 @@
 # Timelines
 You have several timelines to browse trough
 - **Timeline** aka Home Timeline - this timeline contains all posts by people you follow and your own posts, as well as posts mentioning you directly.
 - **Bookmarks** all the posts you've bookmarked. You can bookmark a post by clicking the three dots on the bottom right of the post and choose Bookmark.
 - **Direct Messages** all posts with `direct` scope addressed to you or mentioning you.
 - **Public Timelines** all public posts made by users on the instance you're on
 - **The Whole Known Network** also known as **TWKN** or **Federated Timeline** - all public posts known by your instance. Due to nature of the network your instance may not know *all* the posts on the network, so only posts known by your instance are shown there.
 Note that by default you will see all posts made by other users on your Home Timeline, this contrast behavior of Twitter and Mastodon, which shows you only non-reply posts and replies to people you follow. You can change said behavior in the [settings](settings.md#filtering).
 By default instances will try to send activities (e.g. posts, favorites, etc.) up to 7 days or until the target server received them. For this reason posts that are up to 7 days old and your server didn't know about yet can pop up on your timeline. This is the default behaviour and can be changed by your admin.
--- a/docs/user_guide/users_follow_mute_block.md
+++ b/docs/user_guide/users_follow_mute_block.md
@ -0,0 +1,11 @@
 # Users: follow, mute, block
 When you see someone, you can click on their user picture to view their profile, and click on the userpic in that to see *full* profile. You can **follow** them, **mute** and **block** them.
 **Following** is self-explanatory, it adds them to your Home Timeline, lists you as a follower and gives you access to follower-only posts if they have any.
 **Muting** collapses posts and notifications made by them, giving you an option to see the post if you're curious. Clients other than PleromaFE may completely remove their posts.
 **Blocking** a user removes them from your timeline and notifications and prevents them from following you (automatically unfollows them from you).
 Please note that some users can be "locked", meaning instead of following them you send a follow request they need to approve for you to become their follower.
--- a/package.json
+++ b/package.json
@ -18,6 +18,10 @@
  "dependencies": {
    "@babel/runtime": "^7.7.6",
    "@chenfengyuan/vue-qrcode": "^1.0.0",
    "@fortawesome/fontawesome-svg-core": "^1.2.32",
    "@fortawesome/free-regular-svg-icons": "^5.15.1",
    "@fortawesome/free-solid-svg-icons": "^5.15.1",
    "@fortawesome/vue-fontawesome": "^2.0.0",
    "body-scroll-lock": "^2.6.4",
    "chromatism": "^3.0.0",
    "cropperjs": "^1.4.3",
@ -68,7 +72,6 @@
    "eventsource-polyfill": "^0.9.6",
    "express": "^4.13.3",
    "file-loader": "^3.0.1",
    "fontello-webpack-plugin": "https://github.com/w3geo/fontello-webpack-plugin.git#6149eac8f2672ab6da089e8802fbfcac98487186",
    "function-bind": "^1.0.2",
    "html-webpack-plugin": "^3.0.0",
    "http-proxy-middleware": "^0.17.2",
--- a/src/App.scss
+++ b/src/App.scss
@ -85,7 +85,7 @@ button {
  font-family: sans-serif;
  font-family: var(--interfaceFont, sans-serif);
-  i[class*=icon-] {
+  i[class*=icon-], .svg-inline--fa {
    color: $fallback--text;
    color: var(--btnText, $fallback--text);
  }
@ -106,7 +106,8 @@ button {
    color: var(--btnPressedText, $fallback--text);
    background-color: $fallback--fg;
    background-color: var(--btnPressed, $fallback--fg);
-    i {
+
    svg, i {
      color: $fallback--text;
      color: var(--btnPressedText, $fallback--text);
    }
@ -118,7 +119,8 @@ button {
    color: var(--btnDisabledText, $fallback--text);
    background-color: $fallback--fg;
    background-color: var(--btnDisabled, $fallback--fg);
-    i {
+
    svg, i {
      color: $fallback--text;
      color: var(--btnDisabledText, $fallback--text);
    }
@ -131,7 +133,8 @@ button {
    background-color: var(--btnToggled, $fallback--fg);
    box-shadow: 0px 0px 4px 0px rgba(255, 255, 255, 0.3), 0px 1px 0px 0px rgba(0, 0, 0, 0.2) inset, 0px -1px 0px 0px rgba(255, 255, 255, 0.2) inset;
    box-shadow: var(--buttonPressedShadow);
-    i {
+
    svg, i {
      color: $fallback--text;
      color: var(--btnToggledText, $fallback--text);
    }
@ -185,7 +188,7 @@ input, textarea, .select, .input {
    opacity: 0.5;
  }
-  .icon-down-open {
+  .select-down-icon {
    position: absolute;
    top: 0;
    bottom: 0;
@ -279,7 +282,7 @@ input, textarea, .select, .input {
    + label::before {
      flex-shrink: 0;
      display: inline-block;
-      content: '✔';
+      content: '✓';
      transition: color 200ms;
      width: 1.1em;
      height: 1.1em;
@ -318,7 +321,7 @@ option {
  }
 }
-i[class*=icon-] {
+i[class*=icon-], .svg-inline--fa  {
  color: $fallback--icon;
  color: var(--icon, $fallback--icon);
 }
@ -365,7 +368,9 @@ i[class*=icon-] {
  flex-wrap: wrap;
  .nav-icon {
-    margin-left: 0.4em;
+    margin-left: 0.2em;
    width: 2em;
    text-align: center;
  }
  &.right {
@ -386,7 +391,7 @@ i[class*=icon-] {
  box-sizing: border-box;
  button {
-    &, i[class*=icon-] {
+    &, i[class*=icon-], svg {
      color: $fallback--text;
      color: var(--btnTopBarText, $fallback--text);
    }
@ -460,7 +465,7 @@ i[class*=icon-] {
    flex-basis: 970px;
    height: 50px;
-    a, a i {
+    a, a i, a svg {
      color: $fallback--link;
      color: var(--topBarLink, $fallback--link);
    }
@ -807,8 +812,16 @@ nav {
  }
 }
-.button-icon {
+.fa-scale-110 {
-  font-size: 1.2em;
+  &.svg-inline--fa {
    font-size: 1.1em;
  }
 }
 .fa-old-padding {
  &.svg-inline--fa {
    padding: 0 0.3em;
  }
 }
@keyframes shakeError {
@ -941,6 +954,9 @@ nav {
  min-height: 1.3rem;
  max-height: 1.3rem;
  line-height: 1.3rem;
  max-width: 10em;
  overflow: hidden;
  text-overflow: ellipsis;
 }
 .chat-layout {
--- a/src/App.vue
+++ b/src/App.vue
@ -42,36 +42,42 @@
        <div class="item right">
          <search-bar
            v-if="currentUser || !privateMode"
-            class="nav-icon mobile-hidden"
+            class="mobile-hidden"
            @toggled="onSearchBarToggled"
            @click.stop.native
          />
          <a
            href="#"
-            class="mobile-hidden"
+            class="mobile-hidden nav-icon"
            @click.stop="openSettingsModal"
          >
-            <i
+            <FAIcon
-              class="button-icon icon-cog nav-icon"
+              fixed-width
              class="fa-scale-110 fa-old-padding"
              icon="cog"
              :title="$t('nav.preferences')"
            />
          </a>
          <a
            v-if="currentUser && currentUser.role === 'admin'"
            href="/pleroma/admin/#/login-pleroma"
-            class="mobile-hidden"
+            class="mobile-hidden nav-icon"
            target="_blank"
-          ><i
+          ><FAIcon
-            class="button-icon icon-gauge nav-icon"
+            fixed-width
            class="fa-scale-110 fa-old-padding"
            icon="tachometer-alt"
            :title="$t('nav.administration')"
          /></a>
          <a
            v-if="currentUser"
            href="#"
-            class="mobile-hidden"
+            class="mobile-hidden nav-icon"
            @click.prevent="logout"
-          ><i
+          ><FAIcon
-            class="button-icon icon-logout nav-icon"
+            fixed-width
            class="fa-scale-110 fa-old-padding"
            icon="sign-out-alt"
            :title="$t('login.logout')"
          /></a>
        </div>
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@ -1,6 +1,14 @@
 import { mapState } from 'vuex'
 import ProgressButton from '../progress_button/progress_button.vue'
 import Popover from '../popover/popover.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faEllipsisV
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faEllipsisV
 )
 const AccountActions = {
  props: [
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="account-actions">
+  <div class="AccountActions">
    <Popover
      trigger="click"
      placement="bottom"
@ -63,7 +63,10 @@
        slot="trigger"
        class="btn btn-default ellipsis-button"
      >
-        <i class="icon-ellipsis trigger-button" />
+        <FAIcon
          class="icon"
          icon="ellipsis-v"
        />
      </div>
    </Popover>
  </div>
@ -73,22 +76,22 @@
 <style lang="scss">
@import '../../_variables.scss';
-.account-actions {
+.AccountActions {
-  margin: 0 .8em;
+  button.dropdown-item {
 }
 .account-actions button.dropdown-item {
    margin-left: 0;
-}
+  }
-.account-actions .trigger-button {
+  .ellipsis-button {
    cursor: pointer;
    width: 2.5em;
    margin: -0.5em 0;
    padding: 0.5em 0;
    text-align: center;
    &:not(:hover) .icon {
      color: $fallback--lightText;
      color: var(--lightText, $fallback--lightText);
-  opacity: .8;
+    }
  cursor: pointer;
  &:hover {
    color: $fallback--text;
    color: var(--text, $fallback--text);
  }
 }
 </style>
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@ -3,6 +3,20 @@ import VideoAttachment from '../video_attachment/video_attachment.vue'
 import nsfwImage from '../../assets/nsfw.png'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faFile,
  faMusic,
  faImage,
  faVideo
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faFile,
  faMusic,
  faImage,
  faVideo
 )
 const Attachment = {
  props: [
@ -39,10 +53,10 @@ const Attachment = {
      return this.attachment.description
    },
    placeholderIconClass () {
-      if (this.type === 'image') return 'icon-picture'
+      if (this.type === 'image') return 'image'
-      if (this.type === 'video') return 'icon-video'
+      if (this.type === 'video') return 'video'
-      if (this.type === 'audio') return 'icon-music'
+      if (this.type === 'audio') return 'music'
-      return 'icon-doc'
+      return 'file'
    },
    referrerpolicy () {
      return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer'
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@ -12,7 +12,7 @@
      :alt="attachment.description"
      :title="attachment.description"
    >
-      <span :class="placeholderIconClass" />
+      <FAIcon :icon="placeholderIconClass" />
      <b>{{ nsfw ? "NSFW / " : "" }}</b>{{ placeholderName }}
    </a>
  </div>
@ -28,7 +28,7 @@
      :href="attachment.url"
      :alt="attachment.description"
      :title="attachment.description"
-      @click.prevent="toggleHidden"
+      @click.prevent.stop="toggleHidden"
    >
      <img
        :key="nsfwImage"
@ -36,9 +36,10 @@
        :src="nsfwImage"
        :class="{'small': isSmall}"
      >
-      <i
+      <FAIcon
        v-if="type === 'video'"
-        class="play-icon icon-play-circled"
+        class="play-icon"
        icon="play-circle"
      />
    </a>
    <div
@ -80,10 +81,13 @@
        class="video"
        :attachment="attachment"
        :controls="allowPlay"
        @play="$emit('play')"
        @pause="$emit('pause')"
      />
-      <i
+      <FAIcon
        v-if="!allowPlay"
-        class="play-icon icon-play-circled"
+        class="play-icon"
        icon="play-circle"
      />
    </a>
@ -93,6 +97,8 @@
      :alt="attachment.description"
      :title="attachment.description"
      controls
      @play="$emit('play')"
      @pause="$emit('pause')"
    />
    <div
@ -138,6 +144,10 @@
    white-space: nowrap;
    text-overflow: ellipsis;
    max-width: 100%;
    svg {
      color: inherit;
    }
  }
  .nsfw-placeholder {
--- a/src/components/chat/chat.js
+++ b/src/components/chat/chat.js
@ -5,7 +5,18 @@ import ChatMessage from '../chat_message/chat_message.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 import ChatTitle from '../chat_title/chat_title.vue'
 import chatService from '../../services/chat_service/chat_service.js'
 import { promiseInterval } from '../../services/promise_interval/promise_interval.js'
 import { getScrollPosition, getNewTopPosition, isBottomedOut, scrollableContainerHeight } from './chat_layout_utils.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faChevronDown,
  faChevronLeft
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faChevronDown,
  faChevronLeft
 )
 const BOTTOMED_OUT_OFFSET = 10
 const JUMP_TO_BOTTOM_BUTTON_VISIBILITY_OFFSET = 150
@ -204,9 +215,9 @@ const Chat = {
      }
    },
    readChat () {
-      if (!(this.currentChatMessageService && this.currentChatMessageService.lastMessage)) { return }
+      if (!(this.currentChatMessageService && this.currentChatMessageService.maxId)) { return }
      if (document.hidden) { return }
-      const lastReadId = this.currentChatMessageService.lastMessage.id
+      const lastReadId = this.currentChatMessageService.maxId
      this.$store.dispatch('readChat', { id: this.currentChat.id, lastReadId })
    },
    bottomedOut (offset) {
@ -244,9 +255,9 @@ const Chat = {
      const chatId = chatMessageService.chatId
      const fetchOlderMessages = !!maxId
-      const sinceId = fetchLatest && chatMessageService.lastMessage && chatMessageService.lastMessage.id
+      const sinceId = fetchLatest && chatMessageService.maxId
-      this.backendInteractor.chatMessages({ id: chatId, maxId, sinceId })
+      return this.backendInteractor.chatMessages({ id: chatId, maxId, sinceId })
        .then((messages) => {
          // Clear the current chat in case we're recovering from a ws connection loss.
          if (isFirstFetch) {
@ -287,7 +298,7 @@ const Chat = {
    },
    doStartFetching () {
      this.$store.dispatch('startFetchingCurrentChat', {
-        fetcher: () => setInterval(() => this.fetchChat({ fetchLatest: true }), 5000)
+        fetcher: () => promiseInterval(() => this.fetchChat({ fetchLatest: true }), 5000)
      })
      this.fetchChat({ isFirstFetch: true })
    },
@ -303,7 +314,11 @@ const Chat = {
      return this.backendInteractor.sendChatMessage(params)
        .then(data => {
-          this.$store.dispatch('addChatMessages', { chatId: this.currentChat.id, messages: [data] }).then(() => {
+          this.$store.dispatch('addChatMessages', {
            chatId: this.currentChat.id,
            messages: [data],
            updateMaxId: false
          }).then(() => {
            this.$nextTick(() => {
              this.handleResize()
              // When the posting form size changes because of a media attachment, we need an extra resize
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@ -58,12 +58,8 @@
  .go-back-button {
    cursor: pointer;
-    margin-right: 1.4em;
+    margin-right: 1.7em;
-
+    margin-left: 0.3em;
    i {
      display: flex;
      align-items: center;
    }
  }
  .jump-to-bottom-button {
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@ -14,7 +14,10 @@
            class="go-back-button"
            @click="goBack"
          >
-            <i class="button-icon icon-left-open" />
+            <FAIcon
              size="lg"
              icon="chevron-left"
            />
          </a>
          <div class="title text-center">
            <ChatTitle
@ -58,14 +61,15 @@
              :class="{ 'visible': jumpToBottomButtonVisible }"
              @click="scrollDown({ behavior: 'smooth' })"
            >
-              <i class="icon-down-open">
+              <span>
                <FAIcon icon="chevron-down" />
                <div
                  v-if="newMessageCount"
                  class="badge badge-notification unread-chat-count unread-message-count"
                >
                  {{ newMessageCount }}
                </div>
-              </i>
+              </span>
            </div>
            <PostStatusForm
              :disable-subject="true"
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@ -7,6 +7,16 @@ import LinkPreview from '../link-preview/link-preview.vue'
 import StatusContent from '../status_content/status_content.vue'
 import ChatMessageDate from '../chat_message_date/chat_message_date.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes,
  faEllipsisH
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes,
  faEllipsisH
 )
 const ChatMessage = {
  name: 'ChatMessage',
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@ -24,7 +24,7 @@
    }
  }
-  .icon-ellipsis {
+  .menu-icon {
    cursor: pointer;
    &:hover, .extra-button-popover.open & {
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@ -56,15 +56,16 @@
                      class="dropdown-item dropdown-item-icon"
                      @click="deleteMessage"
                    >
-                      <i class="icon-cancel" /> {{ $t("chats.delete") }}
+                      <FAIcon icon="times" /> {{ $t("chats.delete") }}
                    </button>
                  </div>
                </div>
                <button
                  slot="trigger"
                  class="menu-icon"
                  :title="$t('chats.more')"
                >
-                  <i class="icon-ellipsis" />
+                  <FAIcon icon="ellipsis-h" />
                </button>
              </Popover>
            </div>
--- a/src/components/chat_new/chat_new.js
+++ b/src/components/chat_new/chat_new.js
@ -1,6 +1,16 @@
 import { mapState, mapGetters } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faSearch,
  faChevronLeft
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faSearch,
  faChevronLeft
 )
 const chatNew = {
  components: {
--- a/src/components/chat_new/chat_new.scss
+++ b/src/components/chat_new/chat_new.scss
@ -8,9 +8,7 @@
    }
  }
-  .icon-search {
+  .search-icon {
    font-size: 1.5em;
    float: right;
    margin-right: 0.3em;
  }
@ -25,5 +23,7 @@
  .go-back-button {
    cursor: pointer;
    margin-right: 1.7em;
    margin-left: 0.3em;
  }
 }
--- a/src/components/chat_new/chat_new.vue
+++ b/src/components/chat_new/chat_new.vue
@ -11,12 +11,18 @@
        class="go-back-button"
        @click="goBack"
      >
-        <i class="button-icon icon-left-open" />
+        <FAIcon
          size="lg"
          icon="chevron-left"
        />
      </a>
    </div>
    <div class="input-wrap">
      <div class="input-search">
-        <i class="button-icon icon-search" />
+        <FAIcon
          class="search-icon fa-scale-110 fa-old-padding"
          icon="search"
        />
      </div>
      <input
        ref="search"
--- a/src/components/chat_panel/chat_panel.js
+++ b/src/components/chat_panel/chat_panel.js
@ -1,4 +1,14 @@
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faBullhorn,
  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faBullhorn,
  faTimes
 )
 const chatPanel = {
  props: [ 'floating' ],
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@ -11,9 +11,9 @@
      >
        <div class="title">
          <span>{{ $t('shoutbox.title') }}</span>
-          <i
+          <FAIcon
            v-if="floating"
-            class="icon-cancel"
+            icon="times"
          />
        </div>
      </div>
@ -63,7 +63,10 @@
        @click.stop.prevent="togglePanel"
      >
        <div class="title">
-          <i class="icon-comment-empty" />
+          <FAIcon
            class="icon"
            icon="bullhorn"
          />
          {{ $t('shoutbox.title') }}
        </div>
      </div>
@ -87,7 +90,8 @@
 .chat-panel {
  .chat-heading {
    cursor: pointer;
-    .icon-comment-empty {
+
    .icon {
      color: $fallback--text;
      color: var(--text, $fallback--text);
    }
--- a/src/components/contrast_ratio/contrast_ratio.vue
+++ b/src/components/contrast_ratio/contrast_ratio.vue
@ -8,13 +8,13 @@
      class="rating"
    >
      <span v-if="contrast.aaa">
-        <i class="icon-thumbs-up-alt" />
+        <FAIcon icon="thumbs-up" />
      </span>
      <span v-if="!contrast.aaa && contrast.aa">
-        <i class="icon-adjust" />
+        <FAIcon icon="adjust" />
      </span>
      <span v-if="!contrast.aaa && !contrast.aa">
-        <i class="icon-attention" />
+        <FAIcon icon="exclamation-triangle" />
      </span>
    </span>
    <span
@ -23,19 +23,32 @@
      :title="hint_18pt"
    >
      <span v-if="contrast.laaa">
-        <i class="icon-thumbs-up-alt" />
+        <FAIcon icon="thumbs-up" />
      </span>
      <span v-if="!contrast.laaa && contrast.laa">
-        <i class="icon-adjust" />
+        <FAIcon icon="adjust" />
      </span>
      <span v-if="!contrast.laaa && !contrast.laa">
-        <i class="icon-attention" />
+        <FAIcon icon="exclamation-triangle" />
      </span>
    </span>
  </span>
 </template>
 <script>
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faAdjust,
  faExclamationTriangle,
  faThumbsUp
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faAdjust,
  faExclamationTriangle,
  faThumbsUp
 )
 export default {
  props: {
    large: {
@ -85,6 +98,7 @@ export default {
  .rating {
    display: inline-block;
    text-align: center;
    margin-left: 0.5em;
  }
 }
 </style>
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -44,7 +44,8 @@ const conversation = {
    'isPage',
    'pinnedStatusIdsObject',
    'inProfile',
-    'profileUserId'
+    'profileUserId',
    'virtualHidden'
  ],
  created () {
    if (this.isPage) {
@ -52,6 +53,13 @@ const conversation = {
    }
  },
  computed: {
    hideStatus () {
      if (this.$refs.statusComponent && this.$refs.statusComponent[0]) {
        return this.virtualHidden && this.$refs.statusComponent[0].suspendable
      } else {
        return this.virtualHidden
      }
    },
    status () {
      return this.$store.state.statuses.allStatusesObject[this.statusId]
    },
@ -102,6 +110,10 @@ const conversation = {
    },
    isExpanded () {
      return this.expanded || this.isPage
    },
    hiddenStyle () {
      const height = (this.status && this.status.virtualHeight) || '120px'
      return this.virtualHidden ? { height } : {}
    }
  },
  components: {
@ -121,6 +133,12 @@ const conversation = {
      if (value) {
        this.fetchConversation()
      }
    },
    virtualHidden (value) {
      this.$store.dispatch(
        'setVirtualHeight',
        { statusId: this.statusId, height: `${this.$el.clientHeight}px` }
      )
    }
  },
  methods: {
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@ -1,5 +1,7 @@
 <template>
  <div
    v-if="!hideStatus"
    :style="hiddenStyle"
    class="Conversation"
    :class="{ '-expanded' : isExpanded, 'panel' : isExpanded }"
  >
@ -18,6 +20,7 @@
    <status
      v-for="status in conversation"
      :key="status.id"
      ref="statusComponent"
      :inline-expanded="collapsable && isExpanded"
      :statusoid="status"
      :expandable="!isExpanded"
@ -33,6 +36,10 @@
      @toggleExpanded="toggleExpanded"
    />
  </div>
  <div
    v-else
    :style="hiddenStyle"
  />
 </template>
 <script src="./conversation.js"></script>
@ -53,8 +60,8 @@
    .conversation-status {
      border-color: $fallback--border;
      border-color: var(--border, $fallback--border);
-      border-left: 4px solid $fallback--cRed;
+      border-left-color: $fallback--cRed;
-      border-left: 4px solid var(--cRed, $fallback--cRed);
+      border-left-color: var(--cRed, $fallback--cRed);
    }
    .conversation-status:last-child {
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@ -3,6 +3,15 @@ import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { take } from 'lodash'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faSmileBeam
 } from '@fortawesome/free-regular-svg-icons'
 library.add(
  faSmileBeam
 )
 /**
 * EmojiInput - augmented inputs for emoji and autocomplete support in inputs
 * without having to give up the comfort of <input/> and <textarea/> elements
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -11,7 +11,7 @@
        class="emoji-picker-icon"
        @click.prevent="togglePicker"
      >
-        <i class="icon-smile" />
+        <FAIcon :icon="['far', 'smile-beam']" />
      </div>
      <EmojiPicker
        v-if="enableEmojiPicker"
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@ -1,4 +1,16 @@
 import Checkbox from '../checkbox/checkbox.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faBoxOpen,
  faStickyNote,
  faSmileBeam
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faBoxOpen,
  faStickyNote,
  faSmileBeam
 )
 // At widest, approximately 20 emoji are visible in a row,
 // loading 3 rows, could be overkill for narrow picker
@ -8,7 +20,20 @@ const LOAD_EMOJI_BY = 60
 const LOAD_EMOJI_MARGIN = 64
 const filterByKeyword = (list, keyword = '') => {
-  return list.filter(x => x.displayText.includes(keyword))
+  if (keyword === '') return list
  const keywordLowercase = keyword.toLowerCase()
  let orderedEmojiList = []
  for (const emoji of list) {
    const indexOfKeyword = emoji.displayText.toLowerCase().indexOf(keywordLowercase)
    if (indexOfKeyword > -1) {
      if (!Array.isArray(orderedEmojiList[indexOfKeyword])) {
        orderedEmojiList[indexOfKeyword] = []
      }
      orderedEmojiList[indexOfKeyword].push(emoji)
    }
  }
  return orderedEmojiList.flat()
 }
 const EmojiPicker = {
@ -164,13 +189,13 @@ const EmojiPicker = {
        {
          id: 'custom',
          text: this.$t('emoji.custom'),
-          icon: 'icon-smile',
+          icon: 'smile-beam',
          emojis: customEmojis
        },
        {
          id: 'standard',
          text: this.$t('emoji.unicode'),
-          icon: 'icon-picture',
+          icon: 'box-open',
          emojis: filterByKeyword(standardEmojis, this.keyword)
        }
      ]
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@ -82,7 +82,7 @@
      &.active {
        border-bottom: 4px solid;
-        i {
+        svg {
          color: $fallback--lightText;
          color: var(--lightText, $fallback--lightText);
        }
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@ -13,7 +13,10 @@
          :title="group.text"
          @click.prevent="highlight(group.id)"
        >
-          <i :class="group.icon" />
+          <FAIcon
            :icon="group.icon"
            fixed-width
          />
        </span>
      </span>
      <span
@ -26,7 +29,10 @@
          :title="$t('emoji.stickers')"
          @click.prevent="toggleStickers"
        >
-          <i class="icon-star" />
+          <FAIcon
            icon="sticky-note"
            fixed-width
          />
        </span>
      </span>
    </div>
--- a/src/components/exporter/exporter.js
+++ b/src/components/exporter/exporter.js
@ -1,3 +1,10 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faCircleNotch
 )
 const Exporter = {
  props: {
    getContent: {
--- a/src/components/exporter/exporter.vue
+++ b/src/components/exporter/exporter.vue
@ -1,7 +1,12 @@
 <template>
  <div class="exporter">
    <div v-if="processing">
-      <i class="icon-spin4 animate-spin exporter-processing" />
+      <FAIcon
        icon="circle-notch"
        size="lg"
        spin
      />
      <span>{{ processingMessage }}</span>
    </div>
    <button
@ -19,7 +24,6 @@
 <style lang="scss">
 .exporter {
  &-processing {
    font-size: 1.5em;
    margin: 0.25em;
  }
 }
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@ -1,4 +1,24 @@
 import Popover from '../popover/popover.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faEllipsisH,
  faBookmark,
  faEyeSlash,
  faThumbtack,
  faShareAlt
 } from '@fortawesome/free-solid-svg-icons'
 import {
  faBookmark as faBookmarkReg
 } from '@fortawesome/free-regular-svg-icons'
 library.add(
  faEllipsisH,
  faBookmark,
  faBookmarkReg,
  faEyeSlash,
  faThumbtack,
  faShareAlt
 )
 const ExtraButtons = {
  props: [ 'status' ],
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@ -15,14 +15,22 @@
          class="dropdown-item dropdown-item-icon"
          @click.prevent="muteConversation"
        >
-          <i class="icon-eye-off" /><span>{{ $t("status.mute_conversation") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            icon="eye-slash"
          /><span>{{ $t("status.mute_conversation") }}</span>
        </button>
        <button
          v-if="canMute && status.thread_muted"
          class="dropdown-item dropdown-item-icon"
          @click.prevent="unmuteConversation"
        >
-          <i class="icon-eye-off" /><span>{{ $t("status.unmute_conversation") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            icon="eye-slash"
          /><span>{{ $t("status.unmute_conversation") }}</span>
        </button>
        <button
          v-if="!status.pinned && canPin"
@ -30,7 +38,11 @@
          @click.prevent="pinStatus"
          @click="close"
        >
-          <i class="icon-pin" /><span>{{ $t("status.pin") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            icon="thumbtack"
          /><span>{{ $t("status.pin") }}</span>
        </button>
        <button
          v-if="status.pinned && canPin"
@ -38,7 +50,11 @@
          @click.prevent="unpinStatus"
          @click="close"
        >
-          <i class="icon-pin" /><span>{{ $t("status.unpin") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            icon="thumbtack"
          /><span>{{ $t("status.unpin") }}</span>
        </button>
        <button
          v-if="!status.bookmarked"
@ -46,7 +62,11 @@
          @click.prevent="bookmarkStatus"
          @click="close"
        >
-          <i class="icon-bookmark-empty" /><span>{{ $t("status.bookmark") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            :icon="['far', 'bookmark']"
          /><span>{{ $t("status.bookmark") }}</span>
        </button>
        <button
          v-if="status.bookmarked"
@ -54,7 +74,11 @@
          @click.prevent="unbookmarkStatus"
          @click="close"
        >
-          <i class="icon-bookmark" /><span>{{ $t("status.unbookmark") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            icon="bookmark"
          /><span>{{ $t("status.unbookmark") }}</span>
        </button>
        <button
          v-if="canDelete"
@ -62,21 +86,32 @@
          @click.prevent="deleteStatus"
          @click="close"
        >
-          <i class="icon-cancel" /><span>{{ $t("status.delete") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            icon="times"
          /><span>{{ $t("status.delete") }}</span>
        </button>
        <button
          class="dropdown-item dropdown-item-icon"
          @click.prevent="copyLink"
          @click="close"
        >
-          <i class="icon-share" /><span>{{ $t("status.copy_link") }}</span>
+          <FAIcon
            size="md"
            fixed-width
            icon="share-alt"
          /><span>{{ $t("status.copy_link") }}</span>
        </button>
      </div>
    </div>
-    <i
+    <span slot="trigger">
-      slot="trigger"
+      <FAIcon
-      class="icon-ellipsis button-icon"
+        class="ExtraButtons fa-scale-110 fa-old-padding"
        icon="ellipsis-h"
        size="md"
      />
    </span>
  </Popover>
 </template>
@ -85,8 +120,9 @@
 <style lang="scss">
@import '../../_variables.scss';
-.icon-ellipsis {
+.ExtraButtons {
  cursor: pointer;
  position: static;
  &:hover,
  .extra-button-popover.open & {
--- a/src/components/favorite_button/favorite_button.js
+++ b/src/components/favorite_button/favorite_button.js
@ -1,4 +1,14 @@
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faStar } from '@fortawesome/free-solid-svg-icons'
 import {
  faStar as faStarRegular
 } from '@fortawesome/free-regular-svg-icons'
 library.add(
  faStar,
  faStarRegular
 )
 const FavoriteButton = {
  props: ['status', 'loggedIn'],
@ -23,9 +33,7 @@ const FavoriteButton = {
  computed: {
    classes () {
      return {
-        'icon-star-empty': !this.status.favorited,
+        '-favorited': this.status.favorited
        'icon-star': this.status.favorited,
        'animate-spin': this.animated
      }
    },
    ...mapGetters(['mergedConfig'])
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@ -1,18 +1,21 @@
 <template>
  <div v-if="loggedIn">
-    <i
+    <FAIcon
      :class="classes"
-      class="button-icon favorite-button fav-active"
+      class="FavoriteButton fa-scale-110 fa-old-padding -interactive"
      :title="$t('tool_tip.favorite')"
      :icon="[status.favorited ? 'fas' : 'far', 'star']"
      :spin="animated"
      @click.prevent="favorite()"
    />
    <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
  </div>
  <div v-else>
-    <i
+    <FAIcon
      :class="classes"
-      class="button-icon favorite-button"
+      class="FavoriteButton fa-scale-110 fa-old-padding"
      :title="$t('tool_tip.favorite')"
      :icon="['far', 'star']"
    />
    <span v-if="!mergedConfig.hidePostStats && status.fave_num > 0">{{ status.fave_num }}</span>
  </div>
@ -23,7 +26,8 @@
 <style lang="scss">
@import '../../_variables.scss';
-.fav-active {
+.FavoriteButton {
  &.-interactive {
    cursor: pointer;
    animation-duration: 0.6s;
@ -31,10 +35,11 @@
      color: $fallback--cOrange;
      color: var(--cOrange, $fallback--cOrange);
    }
-}
+  }
-.favorite-button.icon-star {
+  &.-favorited {
    color: $fallback--cOrange;
    color: var(--cOrange, $fallback--cOrange);
  }
 }
 </style>
--- a/src/components/follow_requests/follow_requests.vue
+++ b/src/components/follow_requests/follow_requests.vue
@ -1,8 +1,10 @@
 <template>
  <div class="settings panel panel-default">
    <div class="panel-heading">
      <div class="title">
        {{ $t('nav.friend_requests') }}
      </div>
    </div>
    <div class="panel-body">
      <FollowRequestCard
        v-for="request in requests"
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@ -1,4 +1,12 @@
 import { set } from 'vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faChevronDown
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faChevronDown
 )
 export default {
  props: [
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@ -41,7 +41,10 @@
          {{ option === 'custom' ? $t('settings.style.fonts.custom') : option }}
        </option>
      </select>
-      <i class="icon-down-open" />
+      <FAIcon
        class="select-down-icon"
        icon="chevron-down"
      />
    </label>
    <input
      v-if="isCustom"
--- a/src/components/global_notice_list/global_notice_list.js
+++ b/src/components/global_notice_list/global_notice_list.js
@ -1,3 +1,11 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes
 )
 const GlobalNoticeList = {
  computed: {
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@ -9,8 +9,9 @@
      <div class="notice-message">
        {{ $t(notice.messageKey, notice.messageArgs) }}
      </div>
-      <i
+      <FAIcon
-        class="button-icon icon-cancel"
+        class="fa-scale-110 fa-old-padding"
        icon="times"
        @click="closeNotice(notice)"
      />
    </div>
--- a/src/components/image_cropper/image_cropper.js
+++ b/src/components/image_cropper/image_cropper.js
@ -1,5 +1,15 @@
 import Cropper from 'cropperjs'
 import 'cropperjs/dist/cropper.css'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes,
  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes,
  faCircleNotch
 )
 const ImageCropper = {
  props: {
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@ -31,9 +31,10 @@
          @click="submit(false)"
          v-text="saveWithoutCroppingText"
        />
-        <i
+        <FAIcon
          v-if="submitting"
-          class="icon-spin4 animate-spin"
+          spin
          icon="circle-notch"
        />
      </div>
      <div
@ -41,8 +42,9 @@
        class="alert error"
      >
        {{ submitErrorMsg }}
-        <i
+        <FAIcon
-          class="button-icon icon-cancel"
+          class="fa-scale-110 fa-old-padding"
          icon="times"
          @click="clearError"
        />
      </div>
--- a/src/components/importer/importer.js
+++ b/src/components/importer/importer.js
@ -1,3 +1,14 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faCircleNotch,
  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faCircleNotch,
  faTimes
 )
 const Importer = {
  props: {
    submitHandler: {
--- a/src/components/importer/importer.vue
+++ b/src/components/importer/importer.vue
@ -7,9 +7,11 @@
        @change="change"
      >
    </form>
-    <i
+    <FAIcon
      v-if="submitting"
-      class="icon-spin4 animate-spin importer-uploading"
+      class="importer-uploading"
      spin
      icon="circle-notch"
    />
    <button
      v-else
@ -19,15 +21,15 @@
      {{ submitButtonLabel }}
    </button>
    <div v-if="success">
-      <i
+      <FAIcon
-        class="icon-cross"
+        icon="times"
        @click="dismiss"
      />
      <p>{{ successMessage }}</p>
    </div>
    <div v-else-if="error">
-      <i
+      <FAIcon
-        class="icon-cross"
+        icon="times"
        @click="dismiss"
      />
      <p>{{ errorMessage }}</p>
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@ -19,7 +19,10 @@
          {{ languageNames[i] }}
        </option>
      </select>
-      <i class="icon-down-open" />
+      <FAIcon
        class="select-down-icon"
        icon="chevron-down"
      />
    </label>
  </div>
 </template>
@ -28,6 +31,14 @@
 import languagesObject from '../../i18n/messages'
 import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faChevronDown
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faChevronDown
 )
 export default {
  computed: {
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@ -1,5 +1,13 @@
 import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
 import oauthApi from '../../services/new_api/oauth.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes
 )
 const LoginForm = {
  data: () => ({
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@ -76,8 +76,9 @@
    >
      <div class="alert error">
        {{ error }}
-        <i
+        <FAIcon
-          class="button-icon icon-cancel"
+          class="fa-scale-110 fa-old-padding"
          icon="times"
          @click="clearError"
        />
      </div>
--- a/src/components/media_modal/media_modal.js
+++ b/src/components/media_modal/media_modal.js
@ -3,6 +3,16 @@ import VideoAttachment from '../video_attachment/video_attachment.vue'
 import Modal from '../modal/modal.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import GestureService from '../../services/gesture_service/gesture_service'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faChevronLeft,
  faChevronRight
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faChevronLeft,
  faChevronRight
 )
 const MediaModal = {
  components: {
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@ -34,7 +34,10 @@
      class="modal-view-button-arrow modal-view-button-arrow--prev"
      @click.stop.prevent="goPrev"
    >
-      <i class="icon-left-open arrow-icon" />
+      <FAIcon
        class="arrow-icon"
        icon="chevron-left"
      />
    </button>
    <button
      v-if="canNavigate"
@ -42,7 +45,10 @@
      class="modal-view-button-arrow modal-view-button-arrow--next"
      @click.stop.prevent="goNext"
    >
-      <i class="icon-right-open arrow-icon" />
+      <FAIcon
        class="arrow-icon"
        icon="chevron-right"
      />
    </button>
  </Modal>
 </template>
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@ -2,6 +2,14 @@
 import statusPosterService from '../../services/status_poster/status_poster.service.js'
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faUpload, faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faUpload,
  faCircleNotch
 )
 const mediaUpload = {
  data () {
    return {
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@ -7,13 +7,16 @@
      class="label"
      :title="$t('tool_tip.media_upload')"
    >
-      <i
+      <FAIcon
        v-if="uploading"
-        class="progress-icon icon-spin4 animate-spin"
+        class="progress-icon"
        icon="circle-notch"
        spin
      />
-      <i
+      <FAIcon
        v-if="!uploading"
-        class="new-icon icon-upload"
+        class="new-icon"
        icon="upload"
      />
      <input
        v-if="uploadReady"
@ -40,15 +43,5 @@
  .new-icon {
    cursor: pointer;
  }
  .progress-icon {
    display: inline-block;
    line-height: 0;
    &::before {
      /* Overriding fontello to achieve the perfect speeeen */
      margin: 0;
      line-height: 0;
    }
  }
 }
 </style>
--- a/src/components/mfa_form/recovery_form.js
+++ b/src/components/mfa_form/recovery_form.js
@ -1,5 +1,13 @@
 import mfaApi from '../../services/new_api/mfa.js'
 import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes
 )
 export default {
  data: () => ({
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@ -54,8 +54,9 @@
    >
      <div class="alert error">
        {{ error }}
-        <i
+        <FAIcon
-          class="button-icon icon-cancel"
+          class="fa-scale-110 fa-old-padding"
          icon="times"
          @click="clearError"
        />
      </div>
--- a/src/components/mfa_form/totp_form.js
+++ b/src/components/mfa_form/totp_form.js
@ -1,5 +1,14 @@
 import mfaApi from '../../services/new_api/mfa.js'
 import { mapState, mapGetters, mapActions, mapMutations } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes
 )
 export default {
  data: () => ({
    code: null,
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@ -56,8 +56,10 @@
    >
      <div class="alert error">
        {{ error }}
-        <i
+        <FAIcon
-          class="button-icon icon-cancel"
+          size="lg"
          class="fa-scale-110 fa-old-padding"
          icon="times"
          @click="clearError"
        />
      </div>
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@ -3,6 +3,18 @@ import Notifications from '../notifications/notifications.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes,
  faBell,
  faBars
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes,
  faBell,
  faBars
 )
 const MobileNav = {
  components: {
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@ -15,7 +15,10 @@
            class="mobile-nav-button"
            @click.stop.prevent="toggleMobileSidebar()"
          >
-            <i class="button-icon icon-menu" />
+            <FAIcon
              class="fa-scale-110 fa-old-padding"
              icon="bars"
            />
            <div
              v-if="unreadChatCount"
              class="alert-dot"
@ -37,7 +40,10 @@
            href="#"
            @click.stop.prevent="openMobileNotifications()"
          >
-            <i class="button-icon icon-bell-alt" />
+            <FAIcon
              class="fa-scale-110 fa-old-padding"
              icon="bell"
            />
            <div
              v-if="unseenNotificationsCount"
              class="alert-dot"
@ -59,7 +65,10 @@
          class="mobile-nav-button"
          @click.stop.prevent="closeMobileNotifications()"
        >
-          <i class="button-icon icon-cancel" />
+          <FAIcon
            class="fa-scale-110 fa-old-padding"
            icon="times"
          />
        </a>
      </div>
      <div
@ -91,9 +100,8 @@
 }
 .mobile-nav-button {
-  display: flex;
+  text-align: center;
-  justify-content: center;
+  margin: 0 1em;
  width: 50px;
  position: relative;
  cursor: pointer;
 }
--- a/src/components/mobile_post_status_button/mobile_post_status_button.js
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.js
@ -1,4 +1,12 @@
 import { debounce } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faPen
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faPen
 )
 const HIDDEN_FOR_PAGES = new Set([
  'chats',
--- a/src/components/mobile_post_status_button/mobile_post_status_button.vue
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.vue
@ -5,7 +5,7 @@
      :class="{ 'hidden': isHidden }"
      @click="openPostForm"
    >
-      <i class="icon-edit" />
+      <FAIcon icon="pen" />
    </button>
  </div>
 </template>
@ -39,7 +39,7 @@
    transform: translateY(150%);
  }
-  i {
+  svg {
    font-size: 1.5em;
    color: $fallback--text;
    color: var(--text, $fallback--text);
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@ -178,7 +178,7 @@
  box-shadow: var(--inputShadow);
  &.menu-checkbox-checked::after {
-    content: '✔';
+    content: '✓';
  }
 }
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@ -1,6 +1,29 @@
 import { timelineNames } from '../timeline_menu/timeline_menu.js'
 import { mapState, mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faUsers,
  faGlobe,
  faBookmark,
  faEnvelope,
  faHome,
  faComments,
  faBell,
  faInfoCircle
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faUsers,
  faGlobe,
  faBookmark,
  faEnvelope,
  faHome,
  faComments,
  faBell,
  faInfoCircle
 )
 const NavPanel = {
  created () {
    if (this.currentUser && this.currentUser.locked) {
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@ -1,5 +1,5 @@
 <template>
-  <div class="nav-panel">
+  <div class="NavPanel">
    <div class="panel panel-default">
      <ul>
        <li v-if="currentUser || !privateMode">
@ -7,12 +7,20 @@
            :to="{ name: timelinesRoute }"
            :class="onTimelineRoute && 'router-link-active'"
          >
-            <i class="button-icon icon-home-2" /> {{ $t("nav.timelines") }}
+            <FAIcon
              fixed-width
              class="fa-scale-110"
              icon="home"
            />{{ $t("nav.timelines") }}
          </router-link>
        </li>
        <li v-if="currentUser">
          <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
-            <i class="button-icon icon-bell-alt" /> {{ $t("nav.interactions") }}
+            <FAIcon
              fixed-width
              class="fa-scale-110"
              icon="bell"
            />{{ $t("nav.interactions") }}
          </router-link>
        </li>
        <li v-if="currentUser && pleromaChatMessagesAvailable">
@ -23,12 +31,20 @@
            >
              {{ unreadChatCount }}
            </div>
-            <i class="button-icon icon-chat" /> {{ $t("nav.chats") }}
+            <FAIcon
              fixed-width
              class="fa-scale-110"
              icon="comments"
            />{{ $t("nav.chats") }}
          </router-link>
        </li>
        <li v-if="currentUser && currentUser.locked">
          <router-link :to="{ name: 'friend-requests' }">
-            <i class="button-icon icon-user-plus" /> {{ $t("nav.friend_requests") }}
+            <FAIcon
              fixed-width
              class="fa-scale-110"
              icon="user-plus"
            />{{ $t("nav.friend_requests") }}
            <span
              v-if="followRequestCount > 0"
              class="badge follow-request-count"
@ -39,7 +55,11 @@
        </li>
        <li>
          <router-link :to="{ name: 'about' }">
-            <i class="button-icon icon-info-circled" /> {{ $t("nav.about") }}
+            <FAIcon
              fixed-width
              class="fa-scale-110"
              icon="info-circle"
            />{{ $t("nav.about") }}
          </router-link>
        </li>
      </ul>
@ -52,23 +72,25 @@
 <style lang="scss">
@import '../../_variables.scss';
-.nav-panel .panel {
+.NavPanel {
  .panel {
    overflow: hidden;
    box-shadow: var(--panelShadow);
-}
+  }
-.nav-panel ul {
+
  ul {
    list-style: none;
    margin: 0;
    padding: 0;
-}
+  }
-.follow-request-count {
+  .follow-request-count {
-  margin: -6px 10px;
+    vertical-align: baseline;
    background-color: $fallback--bg;
    background-color: var(--input, $fallback--faint);
-}
+  }
-.nav-panel li {
+  li {
    border-bottom: 1px solid;
    border-color: $fallback--border;
    border-color: var(--border, $fallback--border);
@ -87,15 +109,19 @@
      border-bottom-left-radius: $fallback--panelRadius;
      border-bottom-left-radius: var(--panelRadius, $fallback--panelRadius);
    }
-}
+  }
-.nav-panel li:last-child {
+  li:last-child {
    border: none;
-}
+  }
-.nav-panel a {
+  a {
    display: block;
-  padding: 0.8em 0.85em;
+    box-sizing: border-box;
    align-items: stretch;
    height: 3.5em;
    line-height: 3.5em;
    padding: 0 1em;
    &:hover {
      background-color: $fallback--lightBg;
@ -123,9 +149,10 @@
        text-decoration: underline;
      }
    }
-}
+  }
-.nav-panel .button-icon:before {
+  .fa-scale-110 {
-  width: 1.1em;
+    margin-right: 0.8em;
  }
 }
 </style>
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@ -7,6 +7,28 @@ import Timeago from '../timeago/timeago.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faCheck,
  faTimes,
  faStar,
  faRetweet,
  faUserPlus,
  faEyeSlash,
  faUser,
  faSuitcaseRolling
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faCheck,
  faTimes,
  faStar,
  faRetweet,
  faUserPlus,
  faUser,
  faEyeSlash,
  faSuitcaseRolling
 )
 const Notification = {
  data () {
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@ -1,3 +1,5 @@
@import '../../_variables.scss';
 // TODO Copypaste from Status, should unify it somehow
 .Notification {
  &.-muted {
@ -49,4 +51,34 @@
      display: block;
    }
  }
  .type-icon {
    margin: 0 0.1em;
  }
  &.-type--repeat .type-icon {
    color: $fallback--cGreen;
    color: var(--cGreen, $fallback--cGreen);
  }
  &.-type--follow .type-icon {
    color: $fallback--cBlue;
    color: var(--cBlue, $fallback--cBlue);
  }
  &.-type--follow-request .type-icon {
    color: $fallback--cBlue;
    color: var(--cBlue, $fallback--cBlue);
  }
  &.-type--like .type-icon {
    color: orange;
    color: $fallback--cOrange;
    color: var(--cOrange, $fallback--cOrange);
  }
  &.-type--move .type-icon {
    color: $fallback--cBlue;
    color: var(--cBlue, $fallback--cBlue);
  }
 }
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@ -1,5 +1,5 @@
 <template>
-  <status
+  <Status
    v-if="notification.type === 'mention'"
    :compact="true"
    :statusoid="notification.status"
@ -18,12 +18,15 @@
        href="#"
        class="unmute"
        @click.prevent="toggleMute"
-      ><i class="button-icon icon-eye-off" /></a>
+      ><FAIcon
        class="fa-scale-110 fa-old-padding"
        icon="eye-slash"
      /></a>
    </div>
    <div
      v-else
-      class="non-mention"
+      class="Notification non-mention"
-      :class="[userClass, { highlighted: userStyle }]"
+      :class="[userClass, { highlighted: userStyle }, '-type--' + notification.type]"
      :style="[ userStyle ]"
    >
      <a
@ -60,26 +63,39 @@
              :title="'@'+notification.from_profile.screen_name"
            >{{ notification.from_profile.name }}</span>
            <span v-if="notification.type === 'like'">
-              <i class="fa icon-star lit" />
+              <FAIcon
                class="type-icon"
                icon="star"
              />
              <small>{{ $t('notifications.favorited_you') }}</small>
            </span>
            <span v-if="notification.type === 'repeat'">
-              <i
+              <FAIcon
-                class="fa icon-retweet lit"
+                class="type-icon"
                icon="retweet"
                :title="$t('tool_tip.repeat')"
              />
              <small>{{ $t('notifications.repeated_you') }}</small>
            </span>
            <span v-if="notification.type === 'follow'">
-              <i class="fa icon-user-plus lit" />
+              <FAIcon
                class="type-icon"
                icon="user-plus"
              />
              <small>{{ $t('notifications.followed_you') }}</small>
            </span>
            <span v-if="notification.type === 'follow_request'">
-              <i class="fa icon-user lit" />
+              <FAIcon
                class="type-icon"
                icon="user"
              />
              <small>{{ $t('notifications.follow_request') }}</small>
            </span>
            <span v-if="notification.type === 'move'">
-              <i class="fa icon-arrow-curved lit" />
+              <FAIcon
                class="type-icon"
                icon="suitcase-rolling"
              />
              <small>{{ $t('notifications.migrated_to') }}</small>
            </span>
            <span v-if="notification.type === 'pleroma:emoji_reaction'">
@ -120,7 +136,10 @@
            v-if="needMute"
            href="#"
            @click.prevent="toggleMute"
-          ><i class="button-icon icon-eye-off" /></a>
+          ><FAIcon
            class="fa-scale-110 fa-old-padding"
            icon="eye-slash"
          /></a>
        </span>
        <div
          v-if="notification.type === 'follow' || notification.type === 'follow_request'"
@ -136,13 +155,15 @@
            v-if="notification.type === 'follow_request'"
            style="white-space: nowrap;"
          >
-            <i
+            <FAIcon
-              class="icon-ok button-icon follow-request-accept"
+              icon="check"
              class="fa-scale-110 fa-old-padding follow-request-accept"
              :title="$t('tool_tip.accept_follow_request')"
              @click="approveUser()"
            />
-            <i
+            <FAIcon
-              class="icon-cancel button-icon follow-request-reject"
+              icon="times"
              class="fa-scale-110 fa-old-padding follow-request-reject"
              :title="$t('tool_tip.reject_follow_request')"
              @click="denyUser()"
            />
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@ -6,6 +6,12 @@ import {
  filteredNotificationsFromStore,
  unseenNotificationsFromStore
 } from '../../services/notification_utils/notification_utils.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faCircleNotch
 )
 const DEFAULT_SEEN_TO_DISPLAY_COUNT = 30
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@ -158,37 +158,6 @@
      margin-right: .2em;
    }
    .icon-retweet.lit {
      color: $fallback--cGreen;
      color: var(--cGreen, $fallback--cGreen);
    }
    .icon-user.lit {
      color: $fallback--cBlue;
      color: var(--cBlue, $fallback--cBlue);
    }
    .icon-user-plus.lit {
      color: $fallback--cBlue;
      color: var(--cBlue, $fallback--cBlue);
    }
    .icon-reply.lit {
      color: $fallback--cBlue;
      color: var(--cBlue, $fallback--cBlue);
    }
    .icon-star.lit {
      color: orange;
      color: $fallback--cOrange;
      color: var(--cOrange, $fallback--cOrange);
    }
    .icon-arrow-curved.lit {
      color: $fallback--cBlue;
      color: var(--cBlue, $fallback--cBlue);
    }
    .status-content {
      margin: 0;
      max-height: 300px;
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@ -61,7 +61,11 @@
          v-else
          class="new-status-notification text-center panel-footer"
        >
-          <i class="icon-spin3 animate-spin" />
+          <FAIcon
            icon="circle-notch"
            spin
            size="lg"
          />
        </div>
      </div>
    </div>
--- a/src/components/panel_loading/panel_loading.vue
+++ b/src/components/panel_loading/panel_loading.vue
@ -1,12 +1,25 @@
 <template>
  <div class="panel-loading">
    <span class="loading-text">
-      <i class="icon-spin4 animate-spin" />
+      <FAIcon
        icon="circle-notch"
        spin
        size="3x"
      />
      {{ $t('general.loading') }}
    </span>
  </div>
 </template>
 <script>
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faCircleNotch
 )
 </script>
 <style lang="scss">
@import 'src/_variables.scss';
@ -18,8 +31,7 @@
  font-size: 2em;
  color: $fallback--text;
  color: var(--text, $fallback--text);
-  .loading-text i {
+  .loading-text svg {
    font-size: 3em;
    line-height: 0;
    vertical-align: middle;
    color: $fallback--text;
--- a/src/components/password_reset/password_reset.js
+++ b/src/components/password_reset/password_reset.js
@ -1,5 +1,13 @@
 import { mapState } from 'vuex'
 import passwordResetApi from '../../services/new_api/password_reset.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes
 )
 const passwordReset = {
  data: () => ({
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@ -63,10 +63,10 @@
          >
            <span>{{ error }}</span>
            <a
-              class="button-icon dismiss"
+              class="fa-scale-110 fa-old-padding dismiss"
              @click.prevent="dismissError()"
            >
-              <i class="icon-cancel" />
+              <FAIcon icon="times" />
            </a>
          </p>
        </div>
@ -122,7 +122,7 @@
    padding-right: 2rem;
  }
-  .icon-cancel {
+  .dismiss {
    cursor: pointer;
  }
 }
--- a/src/components/poll/poll_form.js
+++ b/src/components/poll/poll_form.js
@ -1,5 +1,17 @@
 import * as DateUtils from 'src/services/date_utils/date_utils.js'
 import { uniq } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes,
  faChevronDown,
  faPlus
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes,
  faChevronDown,
  faPlus
 )
 export default {
  name: 'PollForm',
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@ -12,6 +12,7 @@
        <input
          :id="`poll-${index}`"
          v-model="options[index]"
          size="1"
          class="poll-option-input"
          type="text"
          :placeholder="$t('polls.option')"
@ -24,8 +25,9 @@
        v-if="options.length > 2"
        class="icon-container"
      >
-        <i
+        <FAIcon
-          class="icon-cancel"
+          icon="times"
          class="delete"
          @click="deleteOption(index)"
        />
      </div>
@ -35,7 +37,11 @@
      class="add-option faint"
      @click="addOption"
    >
-      <i class="icon-plus" />
+      <FAIcon
        icon="plus"
        size="sm"
      />
      {{ $t("polls.add_option") }}
    </a>
    <div class="poll-type-expiry">
@ -55,7 +61,10 @@
            <option value="single">{{ $t('polls.single_choice') }}</option>
            <option value="multiple">{{ $t('polls.multiple_choices') }}</option>
          </select>
-          <i class="icon-down-open" />
+          <FAIcon
            class="select-down-icon"
            icon="chevron-down"
          />
        </label>
      </div>
      <div
@ -83,7 +92,10 @@
              {{ $t(`time.${unit}_short`, ['']) }}
            </option>
          </select>
-          <i class="icon-down-open" />
+          <FAIcon
            class="select-down-icon"
            icon="chevron-down"
          />
        </label>
      </div>
    </div>
@ -103,6 +115,7 @@
  .add-option {
    align-self: flex-start;
    padding-top: 0.25em;
    padding-left: 0.1em;
    cursor: pointer;
  }
@ -124,9 +137,17 @@
  .icon-container {
    // Hack: Move the icon over the input box
-    width: 2em;
+    width: 1.5em;
-    margin-left: -2em;
+    margin-left: -1.5em;
    z-index: 1;
    .delete {
      cursor: pointer;
      &:hover {
        color: inherit;
      }
    }
  }
  .poll-type-expiry {
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@ -27,7 +27,7 @@
 <script src="./popover.js" />
-<style lang=scss>
+<style lang="scss">
@import '../../_variables.scss';
 .popover {
@ -96,7 +96,7 @@
    &-icon {
      padding-left: 0.5rem;
-      i {
+      svg {
        margin-right: 0.25rem;
        color: var(--menuPopoverIcon, $fallback--icon)
      }
@ -111,7 +111,7 @@
      --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint);
      --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText);
      --icon: var(--selectedMenuPopoverIcon, $fallback--icon);
-      i {
+      svg {
        color: var(--selectedMenuPopoverIcon, $fallback--icon);
      }
    }
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -12,6 +12,27 @@ import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faChevronDown,
  faSmileBeam,
  faPollH,
  faUpload,
  faBan,
  faTimes,
  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faChevronDown,
  faSmileBeam,
  faPollH,
  faUpload,
  faBan,
  faTimes,
  faCircleNotch
 )
 const buildMentionsString = ({ user, attentions = [] }, currentUser) => {
  let allAttentions = [...attentions]
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -12,10 +12,11 @@
        v-show="showDropIcon !== 'hide'"
        :style="{ animation: showDropIcon === 'show' ? 'fade-in 0.25s' : 'fade-out 0.5s' }"
        class="drop-indicator"
        :class="[uploadFileLimitReached ? 'icon-block' : 'icon-upload']"
        @dragleave="fileDragStop"
        @drop.stop="fileDrop"
-      />
+      >
        <FAIcon :icon="uploadFileLimitReached ? 'ban' : 'upload'" />
      </div>
      <div class="form-group">
        <i18n
          v-if="!$store.state.users.currentUser.locked && newStatus.visibility == 'private' && !disableLockWarning"
@ -36,10 +37,10 @@
        >
          <span>{{ $t('post_status.scope_notice.public') }}</span>
          <a
-            class="button-icon dismiss"
+            class="fa-scale-110 fa-old-padding dismiss"
            @click.prevent="dismissScopeNotice()"
          >
-            <i class="icon-cancel" />
+            <FAIcon icon="times" />
          </a>
        </p>
        <p
@ -48,10 +49,10 @@
        >
          <span>{{ $t('post_status.scope_notice.unlisted') }}</span>
          <a
-            class="button-icon dismiss"
+            class="fa-scale-110 fa-old-padding dismiss"
            @click.prevent="dismissScopeNotice()"
          >
-            <i class="icon-cancel" />
+            <FAIcon icon="times" />
          </a>
        </p>
        <p
@ -60,10 +61,10 @@
        >
          <span>{{ $t('post_status.scope_notice.private') }}</span>
          <a
-            class="button-icon dismiss"
+            class="fa-scale-110 fa-old-padding dismiss"
            @click.prevent="dismissScopeNotice()"
          >
-            <i class="icon-cancel" />
+            <FAIcon icon="times" />
          </a>
        </p>
        <p
@ -82,11 +83,12 @@
            @click.stop.prevent="togglePreview"
          >
            {{ $t('post_status.preview') }}
-            <i :class="showPreview ? 'icon-left-open' : 'icon-right-open'" />
+            <FAIcon :icon="showPreview ? 'chevron-left' : 'chevron-right'" />
          </a>
-          <i
+          <FAIcon
            v-show="previewLoading"
-            class="icon-spin3 animate-spin"
+            spin
            icon="circle-notch"
          />
        </div>
        <div
@ -123,6 +125,7 @@
            type="text"
            :placeholder="$t('post_status.content_warning')"
            :disabled="posting"
            size="1"
            class="form-post-subject"
          >
        </EmojiInput>
@ -198,7 +201,10 @@
                  {{ $t(`post_status.content_type["${postFormat}"]`) }}
                </option>
              </select>
-              <i class="icon-down-open" />
+              <FAIcon
                class="select-down-icon"
                icon="chevron-down"
              />
            </label>
          </div>
          <div
@ -235,22 +241,22 @@
          <div
            class="emoji-icon"
          >
-            <i
+            <div
              :title="$t('emoji.add_emoji')"
-              class="icon-smile btn btn-default"
+              class="btn btn-default"
              @click="showEmojiPicker"
-            />
+            >
              <FAIcon icon="smile-beam" />
            </div>
          </div>
          <div
            v-if="pollsAvailable"
            class="poll-icon"
            :class="{ selected: pollFormVisible }"
          >
            <i
            :title="$t('polls.add_poll')"
              class="icon-chart-bar btn btn-default"
            @click="togglePollForm"
-            />
+          >
            <FAIcon icon="poll-h" />
          </div>
        </div>
        <button
@ -283,8 +289,9 @@
        class="alert error"
      >
        Error: {{ error }}
-        <i
+        <FAIcon
-          class="button-icon icon-cancel"
+          class="fa-scale-110 fa-old-padding"
          icon="times"
          @click="clearError"
        />
      </div>
@ -294,8 +301,9 @@
          :key="file.url"
          class="media-upload-wrapper"
        >
-          <i
+          <FAIcon
-            class="fa button-icon icon-cancel"
+            class="fa-scale-110 fa-old-padding"
            icon="times"
            @click="removeMediaFile(file)"
          />
          <attachment
@ -378,21 +386,16 @@
    padding-left: 0.5em;
    display: flex;
    width: 100%;
    .icon-spin3 {
      margin-left: auto;
    }
  }
  .preview-toggle {
    display: flex;
    cursor: pointer;
    user-select: none;
    &:hover {
      text-decoration: underline;
    }
-    i {
+    svg, i {
      margin-left: 0.2em;
      font-size: 0.8em;
      transform: rotate(90deg);
@ -434,18 +437,20 @@
  .media-upload-icon, .poll-icon, .emoji-icon {
    font-size: 26px;
    line-height: 1.1;
    flex: 1;
    padding: 0 0.1em;
    &.selected, &:hover {
      // needs to be specific to override icon default color
-      i, label {
+      svg, i, label {
        color: $fallback--lightText;
        color: var(--lightText, $fallback--lightText);
      }
    }
    &.disabled {
-      i {
+      svg, i {
        cursor: not-allowed;
        color: $fallback--icon;
        color: var(--btnDisabledText, $fallback--icon);
@ -474,7 +479,7 @@
    text-align: right;
  }
-  .icon-chart-bar {
+  .poll-icon {
    cursor: pointer;
  }
@ -487,19 +492,6 @@
    margin-bottom: .5em;
    width: 18em;
    .icon-cancel {
      display: inline-block;
      position: static;
      margin: 0;
      padding-bottom: 0;
      margin-left: $fallback--attachmentRadius;
      margin-left: var(--attachmentRadius, $fallback--attachmentRadius);
      background-color: $fallback--fg;
      background-color: var(--btn, $fallback--fg);
      border-bottom-left-radius: 0;
      border-bottom-right-radius: 0;
    }
    img, video {
      object-fit: contain;
      max-height: 10em;
@ -522,7 +514,7 @@
    flex-direction: column;
  }
-  .media-upload-wrapper .attachments {
+   .attachments .media-upload-wrapper {
    padding: 0 0.5em;
    .attachment {
@ -531,14 +523,18 @@
      position: relative;
    }
-    i {
+    .fa-scale-110 fa-old-padding {
      position: absolute;
      margin: 10px;
-      padding: 5px;
+      margin: .75em;
      padding: .5em;
      background: rgba(230,230,230,0.6);
      z-index: 2;
      color: black;
      border-radius: $fallback--attachmentRadius;
      border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
      font-weight: bold;
      cursor: pointer;
    }
  }
@ -612,11 +608,6 @@
    cursor: not-allowed;
  }
  .icon-cancel {
    cursor: pointer;
    z-index: 4;
  }
  @keyframes fade-in {
    from { opacity: 0; }
    to   { opacity: 0.6; }
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@ -1,5 +1,8 @@
 import Popover from '../popover/popover.vue'
-import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
 import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
 library.add(faSmileBeam)
 const ReactButton = {
  props: ['status'],
@ -29,13 +32,23 @@ const ReactButton = {
    emojis () {
      if (this.filterWord !== '') {
        const filterWordLowercase = this.filterWord.toLowerCase()
-        return this.$store.state.instance.emoji.filter(emoji =>
+        let orderedEmojiList = []
-          emoji.displayText.toLowerCase().includes(filterWordLowercase)
+        for (const emoji of this.$store.state.instance.emoji) {
-        )
+          const indexOfFilterWord = emoji.displayText.toLowerCase().indexOf(filterWordLowercase)
          if (indexOfFilterWord > -1) {
            if (!Array.isArray(orderedEmojiList[indexOfFilterWord])) {
              orderedEmojiList[indexOfFilterWord] = []
            }
            orderedEmojiList[indexOfFilterWord].push(emoji)
          }
        }
        return orderedEmojiList.flat()
      }
      return this.$store.state.instance.emoji || []
    },
-    ...mapGetters(['mergedConfig'])
+    mergedConfig () {
      return this.$store.getters.mergedConfig
    }
  }
 }
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@ -36,9 +36,10 @@
        <div class="reaction-bottom-fader" />
      </div>
    </div>
-    <i
+    <FAIcon
      slot="trigger"
-      class="icon-smile button-icon add-reaction-button"
+      class="fa-scale-110 fa-old-padding add-reaction-button"
      :icon="['far', 'smile-beam']"
      :title="$t('tool_tip.add_reaction')"
    />
  </Popover>
--- a/src/components/reply_button/reply_button.js
+++ b/src/components/reply_button/reply_button.js
@ -0,0 +1,16 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faReply } from '@fortawesome/free-solid-svg-icons'
 library.add(faReply)
 const ReplyButton = {
  name: 'ReplyButton',
  props: ['status', 'replying'],
  computed: {
    loggedIn () {
      return !!this.$store.state.users.currentUser
    }
  }
 }
 export default ReplyButton
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@ -0,0 +1,39 @@
 <template>
  <div>
    <FAIcon
      v-if="loggedIn"
      class="ReplyButton fa-scale-110 fa-old-padding -interactive"
      icon="reply"
      :title="$t('tool_tip.reply')"
      :class="{'-active': replying}"
      @click.prevent="$emit('toggle')"
    />
    <FAIcon
      v-else
      icon="reply"
      class="ReplyButton fa-scale-110 fa-old-padding"
      :title="$t('tool_tip.reply')"
    />
    <span v-if="status.replies_count > 0">
      {{ status.replies_count }}
    </span>
  </div>
 </template>
 <script src="./reply_button.js"></script>
 <style lang="scss">
@import '../../_variables.scss';
 .ReplyButton {
  &.-interactive {
    cursor: pointer;
    &:hover,
    &.-active {
      color: $fallback--cBlue;
      color: var(--cBlue, $fallback--cBlue);
    }
  }
 }
 </style>
--- a/src/components/retweet_button/retweet_button.js
+++ b/src/components/retweet_button/retweet_button.js
@ -1,4 +1,7 @@
-import { mapGetters } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
 import { faRetweet } from '@fortawesome/free-solid-svg-icons'
 library.add(faRetweet)
 const RetweetButton = {
  props: ['status', 'loggedIn', 'visibility'],
@ -23,12 +26,12 @@ const RetweetButton = {
  computed: {
    classes () {
      return {
-        'retweeted': this.status.repeated,
+        '-repeated': this.status.repeated
        'retweeted-empty': !this.status.repeated,
        'animate-spin': this.animated
      }
    },
-    ...mapGetters(['mergedConfig'])
+    mergedConfig () {
      return this.$store.getters.mergedConfig
    }
  }
 }
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@ -1,26 +1,30 @@
 <template>
  <div v-if="loggedIn">
    <template v-if="visibility !== 'private' && visibility !== 'direct'">
-      <i
+      <FAIcon
        :class="classes"
-        class="button-icon retweet-button icon-retweet rt-active"
+        class="RetweetButton fa-scale-110 fa-old-padding -interactive"
        icon="retweet"
        :spin="animated"
        :title="$t('tool_tip.repeat')"
        @click.prevent="retweet()"
      />
      <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
    </template>
    <template v-else>
-      <i
+      <FAIcon
        :class="classes"
-        class="button-icon icon-lock"
+        class="RetweetButton fa-scale-110 fa-old-padding"
        icon="lock"
        :title="$t('timeline.no_retweet_hint')"
      />
    </template>
  </div>
  <div v-else-if="!loggedIn">
-    <i
+    <FAIcon
      :class="classes"
-      class="button-icon icon-retweet"
+      class="fa-scale-110 fa-old-padding"
      icon="retweet"
      :title="$t('tool_tip.repeat')"
    />
    <span v-if="!mergedConfig.hidePostStats && status.repeat_num > 0">{{ status.repeat_num }}</span>
@ -31,16 +35,21 @@
 <style lang="scss">
@import '../../_variables.scss';
-.rt-active {
+
 .RetweetButton {
  &.-interactive {
    cursor: pointer;
    animation-duration: 0.6s;
    &:hover {
      color: $fallback--cGreen;
      color: var(--cGreen, $fallback--cGreen);
    }
-}
+  }
-.icon-retweet.retweeted {
+
  &.-repeated {
    color: $fallback--cGreen;
    color: var(--cGreen, $fallback--cGreen);
  }
 }
 </style>
--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@ -1,3 +1,18 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faEnvelope,
  faLock,
  faLockOpen,
  faGlobe
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faEnvelope,
  faGlobe,
  faLock,
  faLockOpen
 )
 const ScopeSelector = {
  props: [
    'showAll',
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@ -1,36 +1,56 @@
 <template>
  <div
    v-if="!showNothing"
-    class="scope-selector"
+    class="ScopeSelector"
  >
-    <i
+    <span
      v-if="showDirect"
-      class="icon-mail-alt"
+      class="scope"
      :class="css.direct"
      :title="$t('post_status.scope.direct')"
      @click="changeVis('direct')"
    >
      <FAIcon
        icon="envelope"
        class="fa-scale-110 fa-old-padding"
      />
-    <i
+    </span>
    <span
      v-if="showPrivate"
-      class="icon-lock"
+      class="scope"
      :class="css.private"
      :title="$t('post_status.scope.private')"
      @click="changeVis('private')"
    >
      <FAIcon
        icon="lock"
        class="fa-scale-110 fa-old-padding"
      />
-    <i
+    </span>
    <span
      v-if="showUnlisted"
-      class="icon-lock-open-alt"
+      class="scope"
      :class="css.unlisted"
      :title="$t('post_status.scope.unlisted')"
      @click="changeVis('unlisted')"
    >
      <FAIcon
        icon="lock-open"
        class="fa-scale-110 fa-old-padding"
      />
-    <i
+    </span>
    <span
      v-if="showPublic"
-      class="icon-globe"
+      class="scope"
      :class="css.public"
      :title="$t('post_status.scope.public')"
      @click="changeVis('public')"
    >
      <FAIcon
        icon="globe"
        class="fa-scale-110 fa-old-padding"
      />
    </span>
  </div>
 </template>
@ -39,12 +59,16 @@
 <style lang="scss">
@import '../../_variables.scss';
-.scope-selector {
+.ScopeSelector {
  i {
    font-size: 1.2em;
    cursor: pointer;
-    &.selected {
+  .scope {
    display: inline-block;
    cursor: pointer;
    min-width: 1.3em;
    min-height: 1.3em;
    text-align: center;
    &.selected svg {
      color: $fallback--lightText;
      color: var(--lightText, $fallback--lightText);
    }
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@ -2,6 +2,16 @@ import FollowCard from '../follow_card/follow_card.vue'
 import Conversation from '../conversation/conversation.vue'
 import Status from '../status/status.vue'
 import map from 'lodash/map'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faCircleNotch,
  faSearch
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faCircleNotch,
  faSearch
 )
 const Search = {
  components: {
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@ -17,14 +17,18 @@
        class="btn search-button"
        @click="newQuery(searchTerm)"
      >
-        <i class="icon-search" />
+        <FAIcon icon="search" />
      </button>
    </div>
    <div
      v-if="loading"
      class="text-center loading-icon"
    >
-      <i class="icon-spin3 animate-spin" />
+      <FAIcon
        icon="circle-notch"
        spin
        size="lg"
      />
    </div>
    <div v-else-if="loaded">
      <div class="search-nav-heading">
--- a/src/components/search_bar/search_bar.js
+++ b/src/components/search_bar/search_bar.js
@ -1,9 +1,19 @@
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faTimes,
  faSearch
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faTimes,
  faSearch
 )
 const SearchBar = {
  data: () => ({
    searchTerm: undefined,
    hidden: true,
-    error: false,
+    error: false
    loading: false
  }),
  watch: {
    '$route': function (route) {
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@ -1,16 +1,15 @@
 <template>
  <div>
    <div class="search-bar-container">
      <i
        v-if="loading"
        class="icon-spin4 finder-icon animate-spin-slow"
      />
      <a
        v-if="hidden"
        href="#"
        class="nav-icon"
        :title="$t('nav.search')"
-      ><i
+      ><FAIcon
-        class="button-icon icon-search"
+        fixed-width
        class="fa-scale-110 fa-old-padding"
        icon="search"
        @click.prevent.stop="toggleHidden"
      /></a>
      <template v-else>
@ -27,12 +26,19 @@
          class="btn search-button"
          @click="find(searchTerm)"
        >
-          <i class="icon-search" />
+          <FAIcon
            fixed-width
            icon="search"
          />
        </button>
-        <i
+        <span>
-          class="button-icon icon-cancel"
+          <FAIcon
            fixed-width
            icon="times"
            class="cancel-icon fa-scale-110 fa-old-padding"
            @click.prevent.stop="toggleHidden"
          />
        </span>
      </template>
    </div>
  </div>
@ -60,13 +66,10 @@
    max-width: calc(100% - 30px - 30px - 20px);
  }
-  .search-button {
+  .cancel-icon {
    margin-left: .5em;
    margin-right: .5em;
  }
  .icon-cancel {
    cursor: pointer;
    color: $fallback--text;
    color: var(--btnTopBarText, $fallback--text);
  }
 }
--- a/src/components/settings_modal/settings_modal_content.js
+++ b/src/components/settings_modal/settings_modal_content.js
@ -10,6 +10,29 @@ import GeneralTab from './tabs/general_tab.vue'
 import VersionTab from './tabs/version_tab.vue'
 import ThemeTab from './tabs/theme_tab/theme_tab.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faWrench,
  faUser,
  faFilter,
  faPaintBrush,
  faBell,
  faDownload,
  faEyeSlash,
  faInfo
 } from '@fortawesome/free-solid-svg-icons'
 library.add(
  faWrench,
  faUser,
  faFilter,
  faPaintBrush,
  faBell,
  faDownload,
  faEyeSlash,
  faInfo
 )
 const SettingsModalContent = {
  components: {
    TabSwitcher,
--- a/src/components/settings_modal/settings_modal_content.scss
+++ b/src/components/settings_modal/settings_modal_content.scss
@ -31,7 +31,7 @@
    }
    .unavailable,
-    .unavailable i {
+    .unavailable svg {
      color: var(--cRed, $fallback--cRed);
      color: $fallback--cRed;
    }
--- a/Show more
+++ b/Show more
`@ -5,4 +5,4 @@ Pleroma-FE is the default user-facing frontend for Pleroma. It's user interface`

	`## How can I use it?`	`## How can I use it?`

	`If your instance uses Pleroma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Pleroma-FE User Guide](./USER_GUIDE.md). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).`	`If your instance uses Pleroma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Pleroma-FE User Guide](./user_guide/). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).`