diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd2b8cf0c..e31cc1ec4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
repository that is by invitation only. You will get a 404 - Not Found if you do
not have access**
+## [5.4.1](https://github.com/FortAwesome/Font-Awesome/releases/tag/5.4.1) - 2018-10-10
+
+### Fixed
+* Separate wand and wand-magic into unique icons
+* Corrected the alignment of linkedin-in
+* Renamed categories "Holiday" to "Halloween" and "Seasonal" to "Autumn"
+
+---
+
## [5.4.0](https://github.com/FortAwesome/Font-Awesome/releases/tag/5.4.0) - 2018-10-08
### Added
diff --git a/UPGRADING.md b/UPGRADING.md
index 56bae927d..127361378 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -6,6 +6,19 @@ This guide is useful to figure out what you need to do between breaking changes.
As always, [submit issues](https://github.com/FortAwesome/Font-Awesome/issues/new) that you run into with this guide or with these upgrades to us.
+## 5.4.0 to 5.4.1
+
+Categories were renamed from:
+
+* Holiday to Halloween
+* Seasonal to Autumn
+
+The "wand" icon in version 5.4.0 matched the "wand-magic" icon. The magical
+sparkles have been removed for "wand". If you were relying on this decoration
+in your design switch to "wand-magic" to bring the magic back.
+
+---
+
## 5.3.x to 5.4.0
There are no breaking changes in this version upgrade.
diff --git a/advanced-options/metadata/categories.yml b/advanced-options/metadata/categories.yml
index ba9085683..d6fa39900 100644
--- a/advanced-options/metadata/categories.yml
+++ b/advanced-options/metadata/categories.yml
@@ -198,6 +198,20 @@ automotive:
- truck-monster
- truck-pickup
label: Automotive
+autumn:
+ icons:
+ - apple-alt
+ - campground
+ - cloud-sun
+ - drumstick-bite
+ - football-ball
+ - hiking
+ - mountain
+ - tractor
+ - tree
+ - wind
+ - wine-bottle
+ label: Autumn
buildings:
icons:
- building
@@ -206,6 +220,7 @@ buildings:
- home
- hospital
- hospital-alt
+ - house-damage
- industry
- mosque
- place-of-worship
@@ -706,6 +721,20 @@ gender:
- venus-double
- venus-mars
label: Genders
+halloween:
+ icons:
+ - book-dead
+ - broom
+ - cat
+ - cloud-moon
+ - crow
+ - ghost
+ - hat-wizard
+ - mask
+ - skull-crossbones
+ - spider
+ - toilet-paper
+ label: Halloween
hands:
icons:
- allergies
@@ -742,20 +771,6 @@ health:
- user-md
- wheelchair
label: Health
-holiday:
- icons:
- - book-dead
- - broom
- - cat
- - cloud-moon
- - crow
- - ghost
- - hat-wizard
- - mask
- - skull-crossbones
- - spider
- - toilet-paper
- label: Holiday
images:
icons:
- adjust
@@ -1451,20 +1466,6 @@ religion:
- vihara
- yin-yang
label: Religion
-seasonal:
- icons:
- - apple-alt
- - campground
- - cloud-sun
- - drumstick-bite
- - football-ball
- - hiking
- - mountain
- - tractor
- - tree
- - wind
- - wine-bottle
- label: Seasonal
shapes:
icons:
- bookmark
@@ -1671,6 +1672,7 @@ users-people:
- user-edit
- user-friends
- user-graduate
+ - user-injured
- user-lock
- user-md
- user-minus
diff --git a/advanced-options/metadata/icons.json b/advanced-options/metadata/icons.json
index e6f4eecb5..789326b6b 100644
--- a/advanced-options/metadata/icons.json
+++ b/advanced-options/metadata/icons.json
@@ -1410,12 +1410,12 @@
"ligatures": [],
"search": {
"terms": [
- "autumn",
"fall",
"food",
"fruit",
"fuji",
- "macintosh"
+ "macintosh",
+ "seasonal"
]
},
"styles": [
@@ -4014,6 +4014,7 @@
"evil",
"fantasy",
"halloween",
+ "holiday",
"read",
"skull",
"spell"
@@ -4451,6 +4452,7 @@
"firebolt",
"fly",
"halloween",
+ "holiday",
"nimbus 2000",
"quidditch",
"sweep",
@@ -5299,10 +5301,10 @@
"ligatures": [],
"search": {
"terms": [
- "autumn",
"camping",
"fall",
"outdoors",
+ "seasonal",
"tent"
]
},
@@ -5961,6 +5963,7 @@
"terms": [
"feline",
"halloween",
+ "holiday",
"kitten",
"kitty",
"meow",
@@ -5974,7 +5977,7 @@
"label": "Cat",
"svg": {
"solid": {
- "last_modified": 1539020258359,
+ "last_modified": 1539286135296,
"raw": "",
"viewBox": [
"0",
@@ -7886,6 +7889,7 @@
"terms": [
"evening",
"halloween",
+ "holiday",
"night",
"sky"
]
@@ -7918,11 +7922,11 @@
"ligatures": [],
"search": {
"terms": [
- "autumn",
"day",
"daytime",
"fall",
- "outdoors"
+ "outdoors",
+ "seasonal"
]
},
"styles": [
@@ -8238,7 +8242,6 @@
"ligatures": [],
"search": {
"terms": [
- "autumn",
"beverage",
"breakfast",
"cafe",
@@ -8246,6 +8249,7 @@
"fall",
"morning",
"mug",
+ "seasonal",
"tea"
]
},
@@ -9775,6 +9779,7 @@
"bullfrog",
"fauna",
"halloween",
+ "holiday",
"toad"
]
},
@@ -15458,9 +15463,9 @@
"ligatures": [],
"search": {
"terms": [
- "autumn",
"fall",
- "pigskin"
+ "pigskin",
+ "seasonal"
]
},
"styles": [
@@ -16279,6 +16284,7 @@
"clyde",
"floating",
"halloween",
+ "holiday",
"inky",
"pinky",
"spirit"
@@ -19272,6 +19278,7 @@
"dnd",
"fantasy",
"halloween",
+ "holiday",
"mage",
"magic",
"pointy",
@@ -19688,11 +19695,11 @@
"search": {
"terms": [
"activity",
- "autumn",
"backpack",
"fall",
"fitness",
"outdoors",
+ "seasonal",
"walking"
]
},
@@ -22882,7 +22889,8 @@
"linkedin-in": {
"changes": [
"2",
- "5.0.0"
+ "5.0.0",
+ "5.4.1"
],
"ligatures": [],
"search": {
@@ -22897,17 +22905,17 @@
"label": "LinkedIn In",
"svg": {
"brands": {
- "last_modified": 1500927880000,
- "raw": "",
+ "last_modified": 1539286135290,
+ "raw": "",
"viewBox": [
"0",
"0",
- "448",
+ "448.1",
"512"
],
"width": 448,
"height": 512,
- "path": "M100.3 480H7.4V180.9h92.9V480zM53.8 140.1C24.1 140.1 0 115.5 0 85.8 0 56.1 24.1 32 53.8 32c29.7 0 53.8 24.1 53.8 53.8 0 29.7-24.1 54.3-53.8 54.3zM448 480h-92.7V334.4c0-34.7-.7-79.2-48.3-79.2-48.3 0-55.7 37.7-55.7 76.7V480h-92.8V180.9h89.1v40.8h1.3c12.4-23.5 42.7-48.3 87.9-48.3 94 0 111.3 61.9 111.3 142.3V480z"
+ "path": "M100.3 448H7.4V148.9h92.9V448zM53.8 108.1C24.1 108.1 0 83.5 0 53.8S24.1 0 53.8 0s53.8 24.1 53.8 53.8-24.1 54.3-53.8 54.3zM448 448h-92.7V302.4c0-34.7-.7-79.2-48.3-79.2-48.3 0-55.7 37.7-55.7 76.7V448h-92.8V148.9h89.1v40.8h1.3c12.4-23.5 42.7-48.3 87.9-48.3 94 0 111.3 61.9 111.3 142.3V448h-.1z"
}
}
},
@@ -24236,6 +24244,7 @@
"costume",
"disguise",
"halloween",
+ "holiday",
"secret",
"super hero"
]
@@ -32667,6 +32676,7 @@
"dnd",
"fantasy",
"halloween",
+ "holiday",
"jolly-roger",
"pirate",
"poison",
@@ -32681,7 +32691,7 @@
"label": "Skull & Crossbones",
"svg": {
"solid": {
- "last_modified": 1539020259417,
+ "last_modified": 1539286135296,
"raw": "",
"viewBox": [
"0",
@@ -33768,7 +33778,8 @@
"charlotte",
"crawl",
"eight",
- "halloween"
+ "halloween",
+ "holiday"
]
},
"styles": [
@@ -37200,6 +37211,7 @@
"terms": [
"bathroom",
"halloween",
+ "holiday",
"lavatory",
"prank",
"restroom",
@@ -37669,13 +37681,13 @@
"ligatures": [],
"search": {
"terms": [
- "autumn",
"bark",
"fall",
"flora",
"forest",
"nature",
- "plant"
+ "plant",
+ "seasonal"
]
},
"styles": [
@@ -40951,10 +40963,10 @@
"search": {
"terms": [
"air",
- "autumn",
"blow",
"breeze",
- "fall"
+ "fall",
+ "seasonal"
]
},
"styles": [
diff --git a/advanced-options/metadata/icons.yml b/advanced-options/metadata/icons.yml
index 44dda8c3e..be12bd478 100644
--- a/advanced-options/metadata/icons.yml
+++ b/advanced-options/metadata/icons.yml
@@ -487,12 +487,12 @@ apple-alt:
label: Fruit Apple
search:
terms:
- - autumn
- fall
- food
- fruit
- fuji
- macintosh
+ - seasonal
styles:
- solid
unicode: f5d1
@@ -1409,6 +1409,7 @@ book-dead:
- evil
- fantasy
- halloween
+ - holiday
- read
- skull
- spell
@@ -1564,6 +1565,7 @@ broom:
- firebolt
- fly
- halloween
+ - holiday
- nimbus 2000
- quidditch
- sweep
@@ -1863,10 +1865,10 @@ campground:
label: Campground
search:
terms:
- - autumn
- camping
- fall
- outdoors
+ - seasonal
- tent
styles:
- solid
@@ -2099,6 +2101,7 @@ cat:
terms:
- feline
- halloween
+ - holiday
- kitten
- kitty
- meow
@@ -2787,6 +2790,7 @@ cloud-moon:
terms:
- evening
- halloween
+ - holiday
- night
- sky
styles:
@@ -2798,11 +2802,11 @@ cloud-sun:
label: Cloud with Sun
search:
terms:
- - autumn
- day
- daytime
- fall
- outdoors
+ - seasonal
styles:
- solid
unicode: f6c4
@@ -2913,7 +2917,6 @@ coffee:
label: Coffee
search:
terms:
- - autumn
- beverage
- breakfast
- cafe
@@ -2921,6 +2924,7 @@ coffee:
- fall
- morning
- mug
+ - seasonal
- tea
styles:
- solid
@@ -3446,6 +3450,7 @@ crow:
- bullfrog
- fauna
- halloween
+ - holiday
- toad
styles:
- solid
@@ -5430,9 +5435,9 @@ football-ball:
label: Football Ball
search:
terms:
- - autumn
- fall
- pigskin
+ - seasonal
styles:
- solid
unicode: f44e
@@ -5708,6 +5713,7 @@ ghost:
- clyde
- floating
- halloween
+ - holiday
- inky
- pinky
- spirit
@@ -6716,6 +6722,7 @@ hat-wizard:
- dnd
- fantasy
- halloween
+ - holiday
- mage
- magic
- pointy
@@ -6875,11 +6882,11 @@ hiking:
search:
terms:
- activity
- - autumn
- backpack
- fall
- fitness
- outdoors
+ - seasonal
- walking
styles:
- solid
@@ -7924,6 +7931,7 @@ linkedin-in:
changes:
- '2'
- 5.0.0
+ - 5.4.1
label: LinkedIn In
search:
terms:
@@ -8446,6 +8454,7 @@ mask:
- costume
- disguise
- halloween
+ - holiday
- secret
- super hero
styles:
@@ -11374,6 +11383,7 @@ skull-crossbones:
- dnd
- fantasy
- halloween
+ - holiday
- jolly-roger
- pirate
- poison
@@ -11762,6 +11772,7 @@ spider:
- crawl
- eight
- halloween
+ - holiday
styles:
- solid
unicode: f717
@@ -12956,6 +12967,7 @@ toilet-paper:
terms:
- bathroom
- halloween
+ - holiday
- lavatory
- prank
- restroom
@@ -13123,13 +13135,13 @@ tree:
label: Tree
search:
terms:
- - autumn
- bark
- fall
- flora
- forest
- nature
- plant
+ - seasonal
styles:
- solid
unicode: f1bb
@@ -14293,10 +14305,10 @@ wind:
search:
terms:
- air
- - autumn
- blow
- breeze
- fall
+ - seasonal
styles:
- solid
unicode: f72e
diff --git a/advanced-options/raw-svg/brands/linkedin-in.svg b/advanced-options/raw-svg/brands/linkedin-in.svg
index 5af65df8c..f97c0ffc2 100644
--- a/advanced-options/raw-svg/brands/linkedin-in.svg
+++ b/advanced-options/raw-svg/brands/linkedin-in.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/advanced-options/svg-sprites/fa-brands.svg b/advanced-options/svg-sprites/fa-brands.svg
index a83ad3f99..075c7be3e 100644
--- a/advanced-options/svg-sprites/fa-brands.svg
+++ b/advanced-options/svg-sprites/fa-brands.svg
@@ -1,6 +1,6 @@