diff --git a/bin/scripts/lib/i_fa.sh b/bin/scripts/lib/i_fa.sh
index c4c059d98f..f3de7a9dfd 100644
--- a/bin/scripts/lib/i_fa.sh
+++ b/bin/scripts/lib/i_fa.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Font Awesome (version 6.5.1, 1474 icons, 343 aliases)
+# Font Awesome (version 6.5.1, 1475 icons, 342 aliases)
 # Does not include all icons of the release
 # Codepoints: ED00-F2FF with gaps
 # Nerd Fonts Version: 3.2.0
@@ -12,7 +12,7 @@ i='' i_fa_microphone_lines=$i
 i='' i_fa_microsoft=$i
 i='' i_fa_mix=$i
 i='' i_fa_mizuni=$i
-i='' i_fa_mobile_screen_button=$i
+i='' i_fa_mobile_button=$i
 i='' i_fa_mobile=$i
 i='' i_fa_mobile_screen=$i
 i='' i_fa_monero=$i
@@ -50,7 +50,7 @@ i='' i_fa_steam_symbol=$i
 i='' i_fa_sticker_mule=$i
 i='' i_fa_studiovinari=$i
 i='' i_fa_supple=$i
-i='' i_fa_tablet_screen_button=$i
+i='' i_fa_tablet_button=$i
 i='' i_fa_tablet=$i
 i='' i_fa_gauge_high=$i
 i='' i_fa_ticket_simple=$i
@@ -261,18 +261,6 @@ i='' i_fa_greater_than_equal=$i
 i='' i_fa_helicopter=$i
 i='' i_fa_infinity=$i
 i='' i_fa_kiwi_bird=$i
-i='' i_fa_less_than=$i
-i='' i_fa_less_than_equal=$i
-i='' i_fa_memory=$i
-i='' i_fa_microphone_lines_slash=$i
-i='' i_fa_money_bill_wave=$i
-i='' i_fa_money_bill_1_wave=$i
-i='' i_fa_money_check=$i
-i='' i_fa_money_check_dollar=$i
-i='' i_fa_not_equal=$i
-i='' i_fa_palette=$i
-i='' i_fa_square_parking=$i
-i='' i_fa_diagram_project=$i
 i='' i_fa_receipt=$i
 i='' i_fa_robot=$i
 i='' i_fa_ruler=$i
@@ -711,6 +699,19 @@ i='' i_fa_swift=$i
 i='' i_fa_umbraco=$i
 i='' i_fa_walkie_talkie=$i
 i='' i_fa_caravan=$i
+i='' i_fa_avianex=$i
+i='' i_fa_less_than=$i
+i='' i_fa_less_than_equal=$i
+i='' i_fa_memory=$i
+i='' i_fa_microphone_lines_slash=$i
+i='' i_fa_money_bill_wave=$i
+i='' i_fa_money_bill_1_wave=$i
+i='' i_fa_money_check=$i
+i='' i_fa_money_check_dollar=$i
+i='' i_fa_not_equal=$i
+i='' i_fa_palette=$i
+i='' i_fa_square_parking=$i
+i='' i_fa_diagram_project=$i
 i='' i_fa_martini_glass_empty=$i
       i_fa_glass=$i
 i='' i_fa_music=$i
@@ -835,18 +836,18 @@ i='' i_fa_circle_plus=$i
       i_fa_plus_circle=$i
 i='' i_fa_circle_minus=$i
       i_fa_minus_circle=$i
-i='' i_fa_circle_xmark=$i
+i='' i_fa_remove_sign=$i
       i_fa_times_circle=$i
-i='' i_fa_circle_check=$i
+i='' i_fa_ok_sign=$i
       i_fa_check_circle=$i
 i='' i_fa_circle_question=$i
       i_fa_question_circle=$i
 i='' i_fa_circle_info=$i
       i_fa_info_circle=$i
 i='' i_fa_crosshairs=$i
-i='' i_fa_right_long=$i
+i='' i_fa_circle_xmark=$i
       i_fa_times_circle_o=$i
-i='' i_fa_up_long=$i
+i='' i_fa_circle_check=$i
       i_fa_check_circle_o=$i
 i='' i_fa_ban=$i
 i='' i_fa_file_pen=$i
@@ -1038,9 +1039,8 @@ i='' i_fa_gavel=$i
 i='' i_fa_gauge_simple_high=$i
       i_fa_dashboard=$i
       i_fa_tachometer=$i
-i='' i_fa_comments_o=$i
-      i_fa_comment_o=$i
-i='' i_fa_avianex=$i
+i='' i_fa_comment_o=$i
+i='' i_fa_comments_o=$i
 i='' i_fa_bolt=$i
       i_fa_flash=$i
 i='' i_fa_sitemap=$i
@@ -1096,8 +1096,8 @@ i='' i_fa_angle_up=$i
 i='' i_fa_angle_down=$i
 i='' i_fa_desktop=$i
 i='' i_fa_laptop=$i
-i='' i_fa_tablet_button=$i
-i='' i_fa_mobile_button=$i
+i='' i_fa_tablet_screen_button=$i
+i='' i_fa_mobile_screen_button=$i
       i_fa_mobile_phone=$i
 i='' i_fa_circle_o=$i
 i='' i_fa_quote_left=$i
@@ -1247,11 +1247,11 @@ i='' i_fa_thumbs_up=$i
 i='' i_fa_thumbs_down=$i
 i='' i_fa_square_youtube=$i
       i_fa_youtube_square=$i
-i='' i_fa_youtube=$i
+i='' i_fa_cloudsmith=$i
 i='' i_fa_xing=$i
 i='' i_fa_square_xing=$i
       i_fa_xing_square=$i
-i='' i_fa_cloudsmith=$i
+i='' i_fa_youtube=$i
       i_fa_youtube_play=$i
 i='' i_fa_dropbox=$i
 i='' i_fa_stack_overflow=$i
@@ -1505,7 +1505,7 @@ i='' i_fa_simplybuilt=$i
 i='' i_fa_skyatlas=$i
 i='' i_fa_cart_plus=$i
 i='' i_fa_cart_arrow_down=$i
-i='' i_fa_diamond=$i
+i='' i_fa_gem=$i
 i='' i_fa_ship=$i
 i='' i_fa_user_secret=$i
 i='' i_fa_motorcycle=$i
@@ -1685,7 +1685,7 @@ i='' i_fa_question_circle_o=$i
 i='' i_fa_person_walking_with_cane=$i
       i_fa_blind=$i
 i='' i_fa_audio_description=$i
-i='' i_fa_gem=$i
+i='' i_fa_diamond=$i
 i='' i_fa_phone_volume=$i
       i_fa_volume_control_phone=$i
 i='' i_fa_braille=$i
diff --git a/src/glyphs/font-awesome/FontAwesome.otf b/src/glyphs/font-awesome/FontAwesome.otf
index e78f9907f8..25a4328009 100644
Binary files a/src/glyphs/font-awesome/FontAwesome.otf and b/src/glyphs/font-awesome/FontAwesome.otf differ
diff --git a/src/glyphs/font-awesome/generate b/src/glyphs/font-awesome/generate
index 30d9661062..6957a48c44 100755
--- a/src/glyphs/font-awesome/generate
+++ b/src/glyphs/font-awesome/generate
@@ -26,7 +26,7 @@ def addIcon(codepoint, name, filename):
     glyph = font.createChar(codepoint, name)
     glyph.importOutlines(filename)
     xmin, ymin, xmax, ymax = glyph.boundingBox()
-    glyph.width = int(xmax + xmin) # make meft and right bearings equal
+    glyph.width = int(xmax + xmin) # make left and right bearings equal
     glyph.manualHints = True
 
 def createGlyphInfo(icon_datasets, filepathname, into):
@@ -71,7 +71,6 @@ font = fontforge.font()
 font.fontname = 'FA-NerdFont-Regular'
 font.fullname = 'FA Nerd Font Regular'
 font.familyname = 'FA Nerd Font'
-font.em = 2048
 font.ascent = 1000
 font.descent = 200
 font.encoding = 'UnicodeFull'
@@ -94,8 +93,8 @@ for _, codepoint, file, *names in mapping:
 num_icons = len(mapping)
 
 print('Generating {} with {} glyphs'.format(fontfile, num_icons))
-font.ascent = 1100
-font.descent = 300
+font.ascent = 1000
+font.descent = 200
 font.generate(os.path.join(fontdir, fontfile), flags=("no-FFTM-table",))
 
 codepoints = [ int(p, 16) for _, p, *_ in mapping ]
diff --git a/src/glyphs/font-awesome/mapping b/src/glyphs/font-awesome/mapping
index 566ac5f5cd..f5ba9e617f 100644
--- a/src/glyphs/font-awesome/mapping
+++ b/src/glyphs/font-awesome/mapping
@@ -9,7 +9,7 @@ F3C9 ED03 solid/microphone-lines.svg microphone_lines
 F3CA ED04 brands/microsoft.svg microsoft
 F3CB ED05 brands/mix.svg mix
 F3CC ED06 brands/mizuni.svg mizuni
-F3CD ED07 solid/mobile-screen-button.svg mobile_screen_button
+F10B ED07 solid/mobile-button.svg mobile_button
 F3CE ED08 solid/mobile.svg mobile
 F3CF ED09 solid/mobile-screen.svg mobile_screen
 F3D0 ED0A brands/monero.svg monero
@@ -47,7 +47,7 @@ F3F6 ED29 brands/steam-symbol.svg steam_symbol
 F3F7 ED2A brands/sticker-mule.svg sticker_mule
 F3F8 ED2B brands/studiovinari.svg studiovinari
 F3F9 ED2C brands/supple.svg supple
-F3FA ED2D solid/tablet-screen-button.svg tablet_screen_button
+F10A ED2D solid/tablet-button.svg tablet_button
 F3FB ED2E solid/tablet.svg tablet
 F3FD ED2F solid/gauge-high.svg gauge_high
 F3FF ED30 solid/ticket-simple.svg ticket_simple
@@ -258,18 +258,6 @@ F532 EDFC solid/greater-than-equal.svg greater_than_equal
 F533 EDFD solid/helicopter.svg helicopter
 F534 EDFE solid/infinity.svg infinity
 F535 EDFF solid/kiwi-bird.svg kiwi_bird
-F536 EE00 solid/less-than.svg less_than
-F537 EE01 solid/less-than-equal.svg less_than_equal
-F538 EE02 solid/memory.svg memory
-F539 EE03 solid/microphone-lines-slash.svg microphone_lines_slash
-F53A EE04 solid/money-bill-wave.svg money_bill_wave
-F53B EE05 solid/money-bill-1-wave.svg money_bill_1_wave
-F53C EE06 solid/money-check.svg money_check
-F53D EE07 solid/money-check-dollar.svg money_check_dollar
-F53E EE08 solid/not-equal.svg not_equal
-F53F EE09 solid/palette.svg palette
-F540 EE0A solid/square-parking.svg square_parking
-F542 EE0B solid/diagram-project.svg diagram_project
 F543 EE0C solid/receipt.svg receipt
 F544 EE0D solid/robot.svg robot
 F545 EE0E solid/ruler.svg ruler
@@ -708,6 +696,19 @@ F8E1 EFBE brands/swift.svg swift
 F8E8 EFBF brands/umbraco.svg umbraco
 F8EF EFC0 solid/walkie-talkie.svg walkie_talkie
 F8FF EFC1 solid/caravan.svg caravan
+F374 EFC2 brands/avianex.svg avianex
+F536 EFC3 solid/less-than.svg less_than
+F537 EFC4 solid/less-than-equal.svg less_than_equal
+F538 EFC5 solid/memory.svg memory
+F539 EFC6 solid/microphone-lines-slash.svg microphone_lines_slash
+F53A EFC7 solid/money-bill-wave.svg money_bill_wave
+F53B EFC8 solid/money-bill-1-wave.svg money_bill_1_wave
+F53C EFC9 solid/money-check.svg money_check
+F53D EFCA solid/money-check-dollar.svg money_check_dollar
+F53E EFCB solid/not-equal.svg not_equal
+F53F EFCC solid/palette.svg palette
+F540 EFCD solid/square-parking.svg square_parking
+F542 EFCE solid/diagram-project.svg diagram_project
 F000 F000 solid/martini-glass-empty.svg martini_glass_empty glass
 F001 F001 solid/music.svg music
 F002 F002 solid/magnifying-glass.svg magnifying_glass search
@@ -795,13 +796,13 @@ F053 F053 solid/chevron-left.svg chevron_left
 F054 F054 solid/chevron-right.svg chevron_right
 F055 F055 solid/circle-plus.svg circle_plus plus_circle
 F056 F056 solid/circle-minus.svg circle_minus minus_circle
-F057 F057 solid/circle-xmark.svg circle_xmark times_circle
-F058 F058 solid/circle-check.svg circle_check check_circle
+F057 F057 solid/circle-xmark.svg remove_sign times_circle
+F058 F058 solid/circle-check.svg ok_sign check_circle
 F059 F059 solid/circle-question.svg circle_question question_circle
 F05A F05A solid/circle-info.svg circle_info info_circle
 F05B F05B solid/crosshairs.svg crosshairs
-F30B F05C solid/right-long.svg right_long times_circle_o
-F30C F05D solid/up-long.svg up_long check_circle_o
+F05C F05C regular/circle-xmark.svg circle_xmark times_circle_o
+F05D F05D regular/circle-check.svg circle_check check_circle_o
 F05E F05E solid/ban.svg ban
 F31C F05F solid/file-pen.svg file_pen
 F060 F060 solid/arrow-left.svg arrow_left
@@ -937,8 +938,8 @@ F0E1 F0E1 brands/linkedin-in.svg linkedin_in linkedin
 F0E2 F0E2 solid/arrow-rotate-left.svg arrow_rotate_left undo
 F0E3 F0E3 solid/gavel.svg gavel legal
 F0E4 F0E4 solid/gauge-simple-high.svg gauge_simple_high dashboard tachometer
-F0E5 F0E5 regular/comment.svg comments_o comment_o
-F374 F0E6 brands/avianex.svg avianex
+F0E5 F0E5 regular/comment.svg comment_o
+F0E6 F0E6 regular/comments.svg comments_o
 F0E7 F0E7 solid/bolt.svg bolt flash
 F0E8 F0E8 solid/sitemap.svg sitemap
 F0E9 F0E9 solid/umbrella.svg umbrella
@@ -974,8 +975,8 @@ F106 F106 solid/angle-up.svg angle_up
 F107 F107 solid/angle-down.svg angle_down
 F108 F108 solid/desktop.svg desktop
 F109 F109 solid/laptop.svg laptop
-F10A F10A solid/tablet-button.svg tablet_button
-F10B F10B solid/mobile-button.svg mobile_button mobile_phone
+F3FA F10A solid/tablet-screen-button.svg tablet_screen_button
+F3CD F10B solid/mobile-screen-button.svg mobile_screen_button mobile_phone
 F10C F10C regular/circle.svg circle_o
 F10D F10D solid/quote-left.svg quote_left
 F10E F10E solid/quote-right.svg quote_right
@@ -1067,10 +1068,10 @@ F163 F163 solid/arrow-up-1-9.svg arrow_up_1_9 sort_numeric_desc
 F164 F164 solid/thumbs-up.svg thumbs_up
 F165 F165 solid/thumbs-down.svg thumbs_down
 F166 F166 brands/square-youtube.svg square_youtube youtube_square
-F167 F167 brands/youtube.svg youtube
+F384 F167 brands/cloudsmith.svg cloudsmith
 F168 F168 brands/xing.svg xing
 F169 F169 brands/square-xing.svg square_xing xing_square
-F384 F16A brands/cloudsmith.svg cloudsmith youtube_play
+F167 F16A brands/youtube.svg youtube youtube_play
 F16B F16B brands/dropbox.svg dropbox
 F16C F16C brands/stack-overflow.svg stack_overflow
 F16D F16D brands/instagram.svg instagram
@@ -1183,7 +1184,7 @@ F1D7 F1D7 brands/weixin.svg weixin wechat
 F1D8 F1D8 solid/paper-plane.svg paper_plane send
 F1D9 F1D9 regular/paper-plane.svg paper_plane_o send_o
 F1DA F1DA solid/clock-rotate-left.svg clock_rotate_left history
-F1DB F1DB solid/circle.svg circle_thin
+F1DB F1DB regular/circle.svg circle_thin
 F1DC F1DC solid/heading.svg heading header
 F1DD F1DD solid/paragraph.svg paragraph
 F1DE F1DE solid/sliders.svg sliders
@@ -1245,7 +1246,7 @@ F215 F215 brands/simplybuilt.svg simplybuilt
 F216 F216 brands/skyatlas.svg skyatlas
 F217 F217 solid/cart-plus.svg cart_plus
 F218 F218 solid/cart-arrow-down.svg cart_arrow_down
-F219 F219 solid/diamond.svg diamond
+F3A5 F219 regular/gem.svg gem
 F21A F21A solid/ship.svg ship
 F21B F21B solid/user-secret.svg user_secret
 F21C F21C solid/motorcycle.svg motorcycle
@@ -1379,7 +1380,7 @@ F29B F29B brands/accessible-icon.svg accessible_icon wheelchair_alt
 F29C F29C regular/circle-question.svg question_circle_o
 F29D F29D solid/person-walking-with-cane.svg person_walking_with_cane blind
 F29E F29E solid/audio-description.svg audio_description
-F3A5 F29F regular/gem.svg gem
+F219 F29F solid/diamond.svg diamond
 F2A0 F2A0 solid/phone-volume.svg phone_volume volume_control_phone
 F2A1 F2A1 solid/braille.svg braille
 F2A2 F2A2 solid/ear-listen.svg ear_listen assistive_listening_systems
@@ -1476,12 +1477,13 @@ F3C1 F2FC solid/lock-open.svg lock_open
 F3C3 F2FD brands/lyft.svg lyft
 F2FE F2FE solid/poo.svg poo
 F3C4 F2FF brands/magento.svg magento
-# Name clash: name: comments_o, old: F0E6, new: F0E5 (F0E5), name at old pos: avianex
+# Name clash: name: youtube, old: F167, new: F16A (F167), name at old pos: cloudsmith
 # Name clash: name: rotate_left, old: F0E2, new: F2EA (F2EA), name at old pos: arrow_rotate_left
 # Name clash: name: rotate_right, old: F01E, new: F2F9 (F2F9), name at old pos: arrow_rotate_right
 # Name clash: name: bitcoin, old: F15A, new: F10F (F379), name at old pos: btc
 # Name clash: name: facebook_f, old: F09A, new: F24F (F39E), name at old pos: facebook
-# Name clash: name: mobile, old: F10B, new: ED08 (F3CE), name at old pos: mobile_button
-# Name clash: name: tablet, old: F10A, new: ED2E (F3FB), name at old pos: tablet_button
+# Name clash: name: diamond, old: F219, new: F29F (F219), name at old pos: gem
+# Name clash: name: mobile, old: F10B, new: ED08 (F3CE), name at old pos: mobile_screen_button
+# Name clash: name: tablet, old: F10A, new: ED2E (F3FB), name at old pos: tablet_screen_button
 # Name clash: name: vimeo, old: F27D, new: ED39 (F40A), name at old pos: vimeo_v
 
diff --git a/src/glyphs/font-awesome/remix b/src/glyphs/font-awesome/remix
index 58ecf7fe31..675d17b96c 100755
--- a/src/glyphs/font-awesome/remix
+++ b/src/glyphs/font-awesome/remix
@@ -14,13 +14,23 @@
 # $ curl -OL https://github.com/FortAwesome/Font-Awesome/releases/download/6.5.1/fontawesome-free-6.5.1-desktop.zip
 # $ unzip fontawesome-free-6.5.1-desktop.zip
 # $ cd fontawesome-free-6.5.1-desktop/otfs
-# $ fontforge ../../remix | grep -v '^#' > ../../remix_mapping
+# $ fontforge ../../remix > ../../remix_mapping
 #
 # We do not use the font file generated by this script
 
 import fontforge, os, sys
 
 def find_destination(codepoint, font):
+    global swap_codes
+    for change in swap_codes:
+        if codepoint not in change:
+            continue
+        if codepoint == change[0]:
+            codepoint = change[1]
+        else:
+            codepoint = change[0]
+        break
+
     if codepoint >= 0xF000 and codepoint < 0xF300:
         # Keep codepoints in legacy region 'Region A'
         return codepoint
@@ -30,7 +40,8 @@ def find_destination(codepoint, font):
     # Fill gaps with the remaing icons (i.e. 'Region B')
     # That will target first the original FA codepoint range in NF (F000-F2FF)
     # and if that is full use the additional range ED00-EFFF
-    for point in [ *range(0xF000, 0xF300), *range(0xED00, 0xF000) ]:
+    # The subrange 0xEE00 - 0xEE0B is reserved for Fira Code progress icons
+    for point in [ *range(0xF000, 0xF300), *range(0xED00, 0xEE00), *range(0xEE0C, 0xF000) ]:
         if point not in font:
             return point
     print("No space found - abort")
@@ -63,6 +74,8 @@ renames = {
     0xF003: 'envelope_o',
     0xF006: 'star_o',
     0xF046: 'check_square_o',
+    0xF057: 'remove_sign',
+    0xF058: 'ok_sign',
     0xF087: 'thumbs_o_up',
     0xF088: 'thumbs_o_down',
     0xF016: 'file_o',
@@ -77,7 +90,7 @@ renames = {
     0xF0A2: 'bell_o',
     0xF0D5: 'google_plus',
     0xF0E5: 'comment_o',
-    0xF0E5: 'comments_o',
+    0xF0E6: 'comments_o',
     0xF0F6: 'file_text_o',
     0xF0F7: 'building_o',
     0xF10C: 'circle_o',
@@ -123,6 +136,13 @@ prefer_solid = {
     0xF2B6, 0xF2B9, 0xF2BB, 0xF2BD, 0xF2C2,
 }
 
+# Special handling of some few icons, see PR #1596
+move_or_drop = { 0xF30B: False, 0xF30C: False, 0xF374: True,
+                 0xF536: True, 0xF537: True, 0xF538: True, 0xF539: True, 0xF53A: True, 0xF53B: True, # move for progress icons
+                 0xF53C: True, 0xF53D: True, 0xF53E: True, 0xF53F: True, 0xF540: True, 0xF542: True, # move for progress icons
+                 0xF219: 0xF3A5, 0xF10A: 0xF3FA, 0xF10B: 0xF3CD, }
+swap_codes = [ (0xF167, 0xF16A), (0xF219, 0xF3A5), (0xF10A, 0xF3FA), (0xF10B, 0xF3CD), ]
+
 block_regular = set()
 
 print('# Intermediate mapping file')
@@ -130,7 +150,20 @@ print('#')
 print('# FA-code NF-code filename FA-name')
 print('#')
 
-for point in [ *range(0xF000, 0xF900), *range(0xE000, 0xF000) ]:
+# Reorder processing to accomodate for glyph shifts introduced
+all_points = [ *range(0xF000, 0xF900), *range(0xE000, 0xF000) ]
+for code, move in move_or_drop.items():
+    if not isinstance(move, bool):
+        i1 = all_points.index(code)
+        i2 = all_points.index(move)
+        all_points[i1] = move
+        all_points[i2] = code
+        continue
+    all_points.remove(code)
+    if move:
+        all_points.append(code)
+
+for point in all_points:
     source = None
     subset = 'none'
     if point in sources.regul and point not in block_regular and point not in prefer_solid:
@@ -140,7 +173,8 @@ for point in [ *range(0xF000, 0xF900), *range(0xE000, 0xF000) ]:
         altuni = source[point].altuni
         if altuni:
             for i, _, _ in altuni:
-                block_regular.add(i)
+                if i != 0xf1db: # Allow circle to be used twice
+                    block_regular.add(i)
     elif point in sources.solid:
         source = sources.solid
         subset = 'solid'
diff --git a/src/glyphs/font-awesome/remix_mapping b/src/glyphs/font-awesome/remix_mapping
index 3512f26891..eda5a86821 100644
--- a/src/glyphs/font-awesome/remix_mapping
+++ b/src/glyphs/font-awesome/remix_mapping
@@ -90,11 +90,15 @@ F053 F053 solid/chevron-left.svg chevron_left
 F054 F054 solid/chevron-right.svg chevron_right
 F055 F055 solid/circle-plus.svg circle_plus
 F056 F056 solid/circle-minus.svg circle_minus
-F057 F057 solid/circle-xmark.svg circle_xmark
-F058 F058 solid/circle-check.svg circle_check
+# RENAME circle_xmark to remove_sign
+F057 F057 solid/circle-xmark.svg remove_sign
+# RENAME circle_check to ok_sign
+F058 F058 solid/circle-check.svg ok_sign
 F059 F059 solid/circle-question.svg circle_question
 F05A F05A solid/circle-info.svg circle_info
 F05B F05B solid/crosshairs.svg crosshairs
+F05C F05C regular/circle-xmark.svg circle_xmark
+F05D F05D regular/circle-check.svg circle_check
 F05E F05E solid/ban.svg ban
 F060 F060 solid/arrow-left.svg arrow_left
 F061 F061 solid/arrow-right.svg arrow_right
@@ -217,8 +221,10 @@ F0E1 F0E1 brands/linkedin-in.svg linkedin_in
 F0E2 F0E2 solid/arrow-rotate-left.svg arrow_rotate_left
 F0E3 F0E3 solid/gavel.svg gavel
 F0E4 F0E4 solid/gauge-simple-high.svg gauge_simple_high
-# RENAME comment to comments_o
-F0E5 F0E5 regular/comment.svg comments_o
+# RENAME comment to comment_o
+F0E5 F0E5 regular/comment.svg comment_o
+# RENAME comments to comments_o
+F0E6 F0E6 regular/comments.svg comments_o
 F0E7 F0E7 solid/bolt.svg bolt
 F0E8 F0E8 solid/sitemap.svg sitemap
 F0E9 F0E9 solid/umbrella.svg umbrella
@@ -254,8 +260,8 @@ F106 F106 solid/angle-up.svg angle_up
 F107 F107 solid/angle-down.svg angle_down
 F108 F108 solid/desktop.svg desktop
 F109 F109 solid/laptop.svg laptop
-F10A F10A solid/tablet-button.svg tablet_button
-F10B F10B solid/mobile-button.svg mobile_button
+F3FA F10A solid/tablet-screen-button.svg tablet_screen_button
+F3CD F10B solid/mobile-screen-button.svg mobile_screen_button
 # RENAME circle to circle_o
 F10C F10C regular/circle.svg circle_o
 F10D F10D solid/quote-left.svg quote_left
@@ -346,7 +352,7 @@ F163 F163 solid/arrow-up-1-9.svg arrow_up_1_9
 F164 F164 solid/thumbs-up.svg thumbs_up
 F165 F165 solid/thumbs-down.svg thumbs_down
 F166 F166 brands/square-youtube.svg square_youtube
-F167 F167 brands/youtube.svg youtube
+F167 F16A brands/youtube.svg youtube
 F168 F168 brands/xing.svg xing
 F169 F169 brands/square-xing.svg square_xing
 F16B F16B brands/dropbox.svg dropbox
@@ -456,7 +462,7 @@ F1D8 F1D8 solid/paper-plane.svg paper_plane
 F1D9 F1D9 regular/paper-plane.svg paper_plane_o
 F1DA F1DA solid/clock-rotate-left.svg clock_rotate_left
 # RENAME circle to circle_thin
-F1DB F1DB solid/circle.svg circle_thin
+F1DB F1DB regular/circle.svg circle_thin
 F1DC F1DC solid/heading.svg heading
 F1DD F1DD solid/paragraph.svg paragraph
 F1DE F1DE solid/sliders.svg sliders
@@ -514,7 +520,7 @@ F215 F215 brands/simplybuilt.svg simplybuilt
 F216 F216 brands/skyatlas.svg skyatlas
 F217 F217 solid/cart-plus.svg cart_plus
 F218 F218 solid/cart-arrow-down.svg cart_arrow_down
-F219 F219 solid/diamond.svg diamond
+F3A5 F219 regular/gem.svg gem
 F21A F21A solid/ship.svg ship
 F21B F21B solid/user-secret.svg user_secret
 F21C F21C solid/motorcycle.svg motorcycle
@@ -724,8 +730,6 @@ F304 F01F solid/pen.svg pen
 F305 F020 solid/pen-clip.svg pen_clip
 F309 F03F solid/down-long.svg down_long
 F30A F04F solid/left-long.svg left_long
-F30B F05C solid/right-long.svg right_long
-F30C F05D solid/up-long.svg up_long
 F31C F05F solid/file-pen.svg file_pen
 F31E F06F solid/maximize.svg maximize
 # RENAME clipboard to clipboard_alt
@@ -749,7 +753,6 @@ F370 F0BE brands/app-store-ios.svg app_store_ios
 F371 F0BF brands/apper.svg apper
 F372 F0CF brands/asymmetrik.svg asymmetrik
 F373 F0DF brands/audible.svg audible
-F374 F0E6 brands/avianex.svg avianex
 F375 F0EF brands/aws.svg aws
 F378 F0FF brands/bimobject.svg bimobject
 F379 F10F brands/bitcoin.svg bitcoin
@@ -760,7 +763,7 @@ F37D F12F brands/blogger-b.svg blogger_b
 F37F F13F brands/buromobelexperte.svg buromobelexperte
 F380 F14F brands/centercode.svg centercode
 F383 F15F brands/cloudscale.svg cloudscale
-F384 F16A brands/cloudsmith.svg cloudsmith
+F384 F167 brands/cloudsmith.svg cloudsmith
 F385 F16F brands/cloudversify.svg cloudversify
 F386 F172 solid/code-commit.svg code_commit
 F387 F17F solid/code-merge.svg code_merge
@@ -786,7 +789,7 @@ F3A1 F262 brands/firstdraft.svg firstdraft
 F3A2 F26F brands/fonticons-fi.svg fonticons_fi
 F3A3 F27F brands/fort-awesome-alt.svg fort_awesome_alt
 F3A4 F28F brands/freebsd.svg freebsd
-F3A5 F29F regular/gem.svg gem
+F219 F29F solid/diamond.svg diamond
 F3A6 F2AC brands/gitkraken.svg gitkraken
 F3A7 F2AF brands/gofore.svg gofore
 F3A8 F2BF brands/goodreads.svg goodreads
@@ -823,7 +826,7 @@ F3C9 ED03 solid/microphone-lines.svg microphone_lines
 F3CA ED04 brands/microsoft.svg microsoft
 F3CB ED05 brands/mix.svg mix
 F3CC ED06 brands/mizuni.svg mizuni
-F3CD ED07 solid/mobile-screen-button.svg mobile_screen_button
+F10B ED07 solid/mobile-button.svg mobile_button
 F3CE ED08 solid/mobile.svg mobile
 F3CF ED09 solid/mobile-screen.svg mobile_screen
 F3D0 ED0A brands/monero.svg monero
@@ -861,7 +864,7 @@ F3F6 ED29 brands/steam-symbol.svg steam_symbol
 F3F7 ED2A brands/sticker-mule.svg sticker_mule
 F3F8 ED2B brands/studiovinari.svg studiovinari
 F3F9 ED2C brands/supple.svg supple
-F3FA ED2D solid/tablet-screen-button.svg tablet_screen_button
+F10A ED2D solid/tablet-button.svg tablet_button
 F3FB ED2E solid/tablet.svg tablet
 F3FD ED2F solid/gauge-high.svg gauge_high
 F3FF ED30 solid/ticket-simple.svg ticket_simple
@@ -1073,18 +1076,6 @@ F532 EDFC solid/greater-than-equal.svg greater_than_equal
 F533 EDFD solid/helicopter.svg helicopter
 F534 EDFE solid/infinity.svg infinity
 F535 EDFF solid/kiwi-bird.svg kiwi_bird
-F536 EE00 solid/less-than.svg less_than
-F537 EE01 solid/less-than-equal.svg less_than_equal
-F538 EE02 solid/memory.svg memory
-F539 EE03 solid/microphone-lines-slash.svg microphone_lines_slash
-F53A EE04 solid/money-bill-wave.svg money_bill_wave
-F53B EE05 solid/money-bill-1-wave.svg money_bill_1_wave
-F53C EE06 solid/money-check.svg money_check
-F53D EE07 solid/money-check-dollar.svg money_check_dollar
-F53E EE08 solid/not-equal.svg not_equal
-F53F EE09 solid/palette.svg palette
-F540 EE0A solid/square-parking.svg square_parking
-F542 EE0B solid/diagram-project.svg diagram_project
 F543 EE0C solid/receipt.svg receipt
 F544 EE0D solid/robot.svg robot
 F545 EE0E solid/ruler.svg ruler
@@ -1925,9 +1916,22 @@ F8FF EFC1 solid/caravan.svg caravan
 # E641 0000 brands/upwork.svg upwork
 # E65C 0000 brands/webflow.svg webflow
 # E663 0000 brands/signal-messenger.svg signal_messenger
+F374 EFC2 brands/avianex.svg avianex
+F536 EFC3 solid/less-than.svg less_than
+F537 EFC4 solid/less-than-equal.svg less_than_equal
+F538 EFC5 solid/memory.svg memory
+F539 EFC6 solid/microphone-lines-slash.svg microphone_lines_slash
+F53A EFC7 solid/money-bill-wave.svg money_bill_wave
+F53B EFC8 solid/money-bill-1-wave.svg money_bill_1_wave
+F53C EFC9 solid/money-check.svg money_check
+F53D EFCA solid/money-check-dollar.svg money_check_dollar
+F53E EFCB solid/not-equal.svg not_equal
+F53F EFCC solid/palette.svg palette
+F540 EFCD solid/square-parking.svg square_parking
+F542 EFCE solid/diagram-project.svg diagram_project
 # Summary
-# - Duplicates 40
+# - Duplicates 37
 # - Dropped 401
-# - From original range 673 (0x2A1)
-# - From extended F0 range 801 (0x321)
+# - From original range 676 (0x2A4)
+# - From extended F0 range 799 (0x31F)
 # - From E0 range 0 (0x0)