diff --git a/scss/brand/brand-icons.scss b/scss/brand.scss
similarity index 71%
rename from scss/brand/brand-icons.scss
rename to scss/brand.scss
index 12fefd8ff..2bfd23469 100755
--- a/scss/brand/brand-icons.scss
+++ b/scss/brand.scss
@@ -6,6 +6,6 @@
  * Licensed under CC0 1.0 Universal
  */
 
-@import "variables";
-@import "functions";
-@import "core";
+@import "brand/variables";
+@import "brand/functions";
+@import "brand/core";
diff --git a/scss/brand/_variables.scss b/scss/brand/_variables.scss
index 3ee436df8..f864c3ab4 100644
--- a/scss/brand/_variables.scss
+++ b/scss/brand/_variables.scss
@@ -530,305 +530,306 @@ $icons: (
   "opera": \ec0e,
   "opsgenie": \ec0f,
   "oracle": \ec10,
-  "orcid": \ec11,
-  "origin": \ec12,
-  "osi": \ec13,
-  "osmc": \ec14,
-  "overcast": \ec15,
-  "overleaf": \ec16,
-  "ovh": \ec17,
-  "pagekit": \ec18,
-  "palantir": \ec19,
-  "pandora": \ec1a,
-  "pantheon": \ec1b,
-  "patreon": \ec1c,
-  "paypal": \ec1d,
-  "periscope": \ec1e,
-  "php": \ec1f,
-  "picarto-tv": \ec20,
-  "pinboard": \ec21,
-  "pingdom": \ec22,
-  "pingup": \ec23,
-  "pinterest": \ec24,
-  "pinterest-p": \ec25,
-  "pivotaltracker": \ec26,
-  "plangrid": \ec27,
-  "player-me": \ec28,
-  "playerfm": \ec29,
-  "playstation": \ec2a,
-  "playstation3": \ec2b,
-  "playstation4": \ec2c,
-  "plesk": \ec2d,
-  "plex": \ec2e,
-  "pluralsight": \ec2f,
-  "plurk": \ec30,
-  "pocket": \ec31,
-  "postgresql": \ec32,
-  "postman": \ec33,
-  "postwoman": \ec34,
-  "powershell": \ec35,
-  "prettier": \ec36,
-  "prismic": \ec37,
-  "probot": \ec38,
-  "processwire": \ec39,
-  "product-hunt": \ec3a,
-  "proto-io": \ec3b,
-  "protonmail": \ec3c,
-  "proxmox": \ec3d,
-  "pypi": \ec3e,
-  "python": \ec3f,
-  "pytorch": \ec40,
-  "qgis": \ec41,
-  "qiita": \ec42,
-  "qq": \ec43,
-  "qualcomm": \ec44,
-  "quantcast": \ec45,
-  "quantopian": \ec46,
-  "quarkus": \ec47,
-  "quora": \ec48,
-  "qwiklabs": \ec49,
-  "qzone": \ec4a,
-  "r": \ec4b,
-  "radiopublic": \ec4c,
-  "rails": \ec4d,
-  "raspberry-pi": \ec4e,
-  "react": \ec4f,
-  "read-the-docs": \ec50,
-  "readme": \ec51,
-  "realm": \ec52,
-  "reason": \ec53,
-  "redbubble": \ec54,
-  "reddit": \ec55,
-  "reddit-alt": \ec56,
-  "redhat": \ec57,
-  "redis": \ec58,
-  "redux": \ec59,
-  "renren": \ec5a,
-  "reverbnation": \ec5b,
-  "riot": \ec5c,
-  "ripple": \ec5d,
-  "riseup": \ec5e,
-  "rollup-js": \ec5f,
-  "roots": \ec60,
-  "roundcube": \ec61,
-  "rss": \ec62,
-  "rstudio": \ec63,
-  "ruby": \ec64,
-  "rubygems": \ec65,
-  "runkeeper": \ec66,
-  "rust": \ec67,
-  "safari": \ec68,
-  "sahibinden": \ec69,
-  "salesforce": \ec6a,
-  "saltstack": \ec6b,
-  "samsung": \ec6c,
-  "samsung-pay": \ec6d,
-  "sap": \ec6e,
-  "sass": \ec6f,
-  "sass-alt": \ec70,
-  "saucelabs": \ec71,
-  "scala": \ec72,
-  "scaleway": \ec73,
-  "scribd": \ec74,
-  "scrutinizerci": \ec75,
-  "seagate": \ec76,
-  "sega": \ec77,
-  "sellfy": \ec78,
-  "semaphoreci": \ec79,
-  "sensu": \ec7a,
-  "sentry": \ec7b,
-  "server-fault": \ec7c,
-  "shazam": \ec7d,
-  "shell": \ec7e,
-  "shopify": \ec7f,
-  "showpad": \ec80,
-  "siemens": \ec81,
-  "signal": \ec82,
-  "sina-weibo": \ec83,
-  "sitepoint": \ec84,
-  "sketch": \ec85,
-  "skillshare": \ec86,
-  "skyliner": \ec87,
-  "skype": \ec88,
-  "slack": \ec89,
-  "slashdot": \ec8a,
-  "slickpic": \ec8b,
-  "slides": \ec8c,
-  "slideshare": \ec8d,
-  "smashingmagazine": \ec8e,
-  "snapchat": \ec8f,
-  "snapcraft": \ec90,
-  "snyk": \ec91,
-  "society6": \ec92,
-  "socket-io": \ec93,
-  "sogou": \ec94,
-  "solus": \ec95,
-  "songkick": \ec96,
-  "sonos": \ec97,
-  "soundcloud": \ec98,
-  "sourceforge": \ec99,
-  "sourcegraph": \ec9a,
-  "spacemacs": \ec9b,
-  "spacex": \ec9c,
-  "sparkfun": \ec9d,
-  "sparkpost": \ec9e,
-  "spdx": \ec9f,
-  "speaker-deck": \eca0,
-  "spectrum": \eca1,
-  "spotify": \eca2,
-  "spotlight": \eca3,
-  "spreaker": \eca4,
-  "spring": \eca5,
-  "sprint": \eca6,
-  "squarespace": \eca7,
-  "stackbit": \eca8,
-  "stackexchange": \eca9,
-  "stackoverflow": \ecaa,
-  "stackpath": \ecab,
-  "stackshare": \ecac,
-  "stadia": \ecad,
-  "statamic": \ecae,
-  "staticman": \ecaf,
-  "statuspage": \ecb0,
-  "steam": \ecb1,
-  "steem": \ecb2,
-  "steemit": \ecb3,
-  "stitcher": \ecb4,
-  "storify": \ecb5,
-  "storybook": \ecb6,
-  "strapi": \ecb7,
-  "strava": \ecb8,
-  "stripe": \ecb9,
-  "stripe-s": \ecba,
-  "stubhub": \ecbb,
-  "stumbleupon": \ecbc,
-  "styleshare": \ecbd,
-  "stylus": \ecbe,
-  "sublime-text": \ecbf,
-  "subversion": \ecc0,
-  "superuser": \ecc1,
-  "svelte": \ecc2,
-  "svg": \ecc3,
-  "swagger": \ecc4,
-  "swarm": \ecc5,
-  "swift": \ecc6,
-  "symantec": \ecc7,
-  "symfony": \ecc8,
-  "synology": \ecc9,
-  "t-mobile": \ecca,
-  "tableau": \eccb,
-  "tails": \eccc,
-  "tapas": \eccd,
-  "teamviewer": \ecce,
-  "ted": \eccf,
-  "teespring": \ecd0,
-  "telegram": \ecd1,
-  "telegram-plane": \ecd2,
-  "tencent-qq": \ecd3,
-  "tencent-weibo": \ecd4,
-  "tensorflow": \ecd5,
-  "terraform": \ecd6,
-  "tesla": \ecd7,
-  "the-mighty": \ecd8,
-  "the-movie-database": \ecd9,
-  "tidal": \ecda,
-  "tiktok": \ecdb,
-  "tinder": \ecdc,
-  "todoist": \ecdd,
-  "toggl": \ecde,
-  "topcoder": \ecdf,
-  "toptal": \ece0,
-  "tor": \ece1,
-  "toshiba": \ece2,
-  "trainerroad": \ece3,
-  "trakt": \ece4,
-  "travisci": \ece5,
-  "treehouse": \ece6,
-  "trello": \ece7,
-  "tripadvisor": \ece8,
-  "trulia": \ece9,
-  "tumblr": \ecea,
-  "twilio": \eceb,
-  "twitch": \ecec,
-  "twitter": \eced,
-  "twoo": \ecee,
-  "typescript": \ecef,
-  "typo3": \ecf0,
-  "uber": \ecf1,
-  "ubisoft": \ecf2,
-  "ublock-origin": \ecf3,
-  "ubuntu": \ecf4,
-  "udacity": \ecf5,
-  "udemy": \ecf6,
-  "uikit": \ecf7,
-  "umbraco": \ecf8,
-  "unity": \ecf9,
-  "unreal-engine": \ecfa,
-  "unsplash": \ecfb,
-  "untappd": \ecfc,
-  "upwork": \ecfd,
-  "usb": \ecfe,
-  "v8": \ecff,
-  "vagrant": \ed00,
-  "venmo": \ed01,
-  "verizon": \ed02,
-  "viadeo": \ed03,
-  "viber": \ed04,
-  "vim": \ed05,
-  "vimeo": \ed06,
-  "vimeo-v": \ed07,
-  "vine": \ed08,
-  "virb": \ed09,
-  "visa": \ed0a,
-  "visual-studio": \ed0b,
-  "visual-studio-code": \ed0c,
-  "vk": \ed0d,
-  "vlc": \ed0e,
-  "vsco": \ed0f,
-  "vue-js": \ed10,
-  "wattpad": \ed11,
-  "weasyl": \ed12,
-  "webcomponents-org": \ed13,
-  "webpack": \ed14,
-  "webstorm": \ed15,
-  "wechat": \ed16,
-  "whatsapp": \ed17,
-  "when-i-work": \ed18,
-  "wii": \ed19,
-  "wiiu": \ed1a,
-  "wikipedia": \ed1b,
-  "windows": \ed1c,
-  "wire": \ed1d,
-  "wireguard": \ed1e,
-  "wix": \ed1f,
-  "wolfram": \ed20,
-  "wolfram-language": \ed21,
-  "wolfram-mathematica": \ed22,
-  "wordpress": \ed23,
-  "wpengine": \ed24,
-  "x-pack": \ed25,
-  "xbox": \ed26,
-  "xcode": \ed27,
-  "xero": \ed28,
-  "xiaomi": \ed29,
-  "xing": \ed2a,
-  "xrp": \ed2b,
-  "xsplit": \ed2c,
-  "y-combinator": \ed2d,
-  "yahoo": \ed2e,
-  "yammer": \ed2f,
-  "yandex": \ed30,
-  "yarn": \ed31,
-  "yelp": \ed32,
-  "youtube": \ed33,
-  "zalando": \ed34,
-  "zapier": \ed35,
-  "zeit": \ed36,
-  "zendesk": \ed37,
-  "zerply": \ed38,
-  "zillow": \ed39,
-  "zingat": \ed3a,
-  "zoom": \ed3b,
-  "zorin": \ed3c,
-  "zulip": \ed3d,
+  "oracle-netsuite": \ec11,
+  "orcid": \ec12,
+  "origin": \ec13,
+  "osi": \ec14,
+  "osmc": \ec15,
+  "overcast": \ec16,
+  "overleaf": \ec17,
+  "ovh": \ec18,
+  "pagekit": \ec19,
+  "palantir": \ec1a,
+  "pandora": \ec1b,
+  "pantheon": \ec1c,
+  "patreon": \ec1d,
+  "paypal": \ec1e,
+  "periscope": \ec1f,
+  "php": \ec20,
+  "picarto-tv": \ec21,
+  "pinboard": \ec22,
+  "pingdom": \ec23,
+  "pingup": \ec24,
+  "pinterest": \ec25,
+  "pinterest-p": \ec26,
+  "pivotaltracker": \ec27,
+  "plangrid": \ec28,
+  "player-me": \ec29,
+  "playerfm": \ec2a,
+  "playstation": \ec2b,
+  "playstation3": \ec2c,
+  "playstation4": \ec2d,
+  "plesk": \ec2e,
+  "plex": \ec2f,
+  "pluralsight": \ec30,
+  "plurk": \ec31,
+  "pocket": \ec32,
+  "postgresql": \ec33,
+  "postman": \ec34,
+  "postwoman": \ec35,
+  "powershell": \ec36,
+  "prettier": \ec37,
+  "prismic": \ec38,
+  "probot": \ec39,
+  "processwire": \ec3a,
+  "product-hunt": \ec3b,
+  "proto-io": \ec3c,
+  "protonmail": \ec3d,
+  "proxmox": \ec3e,
+  "pypi": \ec3f,
+  "python": \ec40,
+  "pytorch": \ec41,
+  "qgis": \ec42,
+  "qiita": \ec43,
+  "qq": \ec44,
+  "qualcomm": \ec45,
+  "quantcast": \ec46,
+  "quantopian": \ec47,
+  "quarkus": \ec48,
+  "quora": \ec49,
+  "qwiklabs": \ec4a,
+  "qzone": \ec4b,
+  "r": \ec4c,
+  "radiopublic": \ec4d,
+  "rails": \ec4e,
+  "raspberry-pi": \ec4f,
+  "react": \ec50,
+  "read-the-docs": \ec51,
+  "readme": \ec52,
+  "realm": \ec53,
+  "reason": \ec54,
+  "redbubble": \ec55,
+  "reddit": \ec56,
+  "reddit-alt": \ec57,
+  "redhat": \ec58,
+  "redis": \ec59,
+  "redux": \ec5a,
+  "renren": \ec5b,
+  "reverbnation": \ec5c,
+  "riot": \ec5d,
+  "ripple": \ec5e,
+  "riseup": \ec5f,
+  "rollup-js": \ec60,
+  "roots": \ec61,
+  "roundcube": \ec62,
+  "rss": \ec63,
+  "rstudio": \ec64,
+  "ruby": \ec65,
+  "rubygems": \ec66,
+  "runkeeper": \ec67,
+  "rust": \ec68,
+  "safari": \ec69,
+  "sahibinden": \ec6a,
+  "salesforce": \ec6b,
+  "saltstack": \ec6c,
+  "samsung": \ec6d,
+  "samsung-pay": \ec6e,
+  "sap": \ec6f,
+  "sass": \ec70,
+  "sass-alt": \ec71,
+  "saucelabs": \ec72,
+  "scala": \ec73,
+  "scaleway": \ec74,
+  "scribd": \ec75,
+  "scrutinizerci": \ec76,
+  "seagate": \ec77,
+  "sega": \ec78,
+  "sellfy": \ec79,
+  "semaphoreci": \ec7a,
+  "sensu": \ec7b,
+  "sentry": \ec7c,
+  "server-fault": \ec7d,
+  "shazam": \ec7e,
+  "shell": \ec7f,
+  "shopify": \ec80,
+  "showpad": \ec81,
+  "siemens": \ec82,
+  "signal": \ec83,
+  "sina-weibo": \ec84,
+  "sitepoint": \ec85,
+  "sketch": \ec86,
+  "skillshare": \ec87,
+  "skyliner": \ec88,
+  "skype": \ec89,
+  "slack": \ec8a,
+  "slashdot": \ec8b,
+  "slickpic": \ec8c,
+  "slides": \ec8d,
+  "slideshare": \ec8e,
+  "smashingmagazine": \ec8f,
+  "snapchat": \ec90,
+  "snapcraft": \ec91,
+  "snyk": \ec92,
+  "society6": \ec93,
+  "socket-io": \ec94,
+  "sogou": \ec95,
+  "solus": \ec96,
+  "songkick": \ec97,
+  "sonos": \ec98,
+  "soundcloud": \ec99,
+  "sourceforge": \ec9a,
+  "sourcegraph": \ec9b,
+  "spacemacs": \ec9c,
+  "spacex": \ec9d,
+  "sparkfun": \ec9e,
+  "sparkpost": \ec9f,
+  "spdx": \eca0,
+  "speaker-deck": \eca1,
+  "spectrum": \eca2,
+  "spotify": \eca3,
+  "spotlight": \eca4,
+  "spreaker": \eca5,
+  "spring": \eca6,
+  "sprint": \eca7,
+  "squarespace": \eca8,
+  "stackbit": \eca9,
+  "stackexchange": \ecaa,
+  "stackoverflow": \ecab,
+  "stackpath": \ecac,
+  "stackshare": \ecad,
+  "stadia": \ecae,
+  "statamic": \ecaf,
+  "staticman": \ecb0,
+  "statuspage": \ecb1,
+  "steam": \ecb2,
+  "steem": \ecb3,
+  "steemit": \ecb4,
+  "stitcher": \ecb5,
+  "storify": \ecb6,
+  "storybook": \ecb7,
+  "strapi": \ecb8,
+  "strava": \ecb9,
+  "stripe": \ecba,
+  "stripe-s": \ecbb,
+  "stubhub": \ecbc,
+  "stumbleupon": \ecbd,
+  "styleshare": \ecbe,
+  "stylus": \ecbf,
+  "sublime-text": \ecc0,
+  "subversion": \ecc1,
+  "superuser": \ecc2,
+  "svelte": \ecc3,
+  "svg": \ecc4,
+  "swagger": \ecc5,
+  "swarm": \ecc6,
+  "swift": \ecc7,
+  "symantec": \ecc8,
+  "symfony": \ecc9,
+  "synology": \ecca,
+  "t-mobile": \eccb,
+  "tableau": \eccc,
+  "tails": \eccd,
+  "tapas": \ecce,
+  "teamviewer": \eccf,
+  "ted": \ecd0,
+  "teespring": \ecd1,
+  "telegram": \ecd2,
+  "telegram-plane": \ecd3,
+  "tencent-qq": \ecd4,
+  "tencent-weibo": \ecd5,
+  "tensorflow": \ecd6,
+  "terraform": \ecd7,
+  "tesla": \ecd8,
+  "the-mighty": \ecd9,
+  "the-movie-database": \ecda,
+  "tidal": \ecdb,
+  "tiktok": \ecdc,
+  "tinder": \ecdd,
+  "todoist": \ecde,
+  "toggl": \ecdf,
+  "topcoder": \ece0,
+  "toptal": \ece1,
+  "tor": \ece2,
+  "toshiba": \ece3,
+  "trainerroad": \ece4,
+  "trakt": \ece5,
+  "travisci": \ece6,
+  "treehouse": \ece7,
+  "trello": \ece8,
+  "tripadvisor": \ece9,
+  "trulia": \ecea,
+  "tumblr": \eceb,
+  "twilio": \ecec,
+  "twitch": \eced,
+  "twitter": \ecee,
+  "twoo": \ecef,
+  "typescript": \ecf0,
+  "typo3": \ecf1,
+  "uber": \ecf2,
+  "ubisoft": \ecf3,
+  "ublock-origin": \ecf4,
+  "ubuntu": \ecf5,
+  "udacity": \ecf6,
+  "udemy": \ecf7,
+  "uikit": \ecf8,
+  "umbraco": \ecf9,
+  "unity": \ecfa,
+  "unreal-engine": \ecfb,
+  "unsplash": \ecfc,
+  "untappd": \ecfd,
+  "upwork": \ecfe,
+  "usb": \ecff,
+  "v8": \ed00,
+  "vagrant": \ed01,
+  "venmo": \ed02,
+  "verizon": \ed03,
+  "viadeo": \ed04,
+  "viber": \ed05,
+  "vim": \ed06,
+  "vimeo": \ed07,
+  "vimeo-v": \ed08,
+  "vine": \ed09,
+  "virb": \ed0a,
+  "visa": \ed0b,
+  "visual-studio": \ed0c,
+  "visual-studio-code": \ed0d,
+  "vk": \ed0e,
+  "vlc": \ed0f,
+  "vsco": \ed10,
+  "vue-js": \ed11,
+  "wattpad": \ed12,
+  "weasyl": \ed13,
+  "webcomponents-org": \ed14,
+  "webpack": \ed15,
+  "webstorm": \ed16,
+  "wechat": \ed17,
+  "whatsapp": \ed18,
+  "when-i-work": \ed19,
+  "wii": \ed1a,
+  "wiiu": \ed1b,
+  "wikipedia": \ed1c,
+  "windows": \ed1d,
+  "wire": \ed1e,
+  "wireguard": \ed1f,
+  "wix": \ed20,
+  "wolfram": \ed21,
+  "wolfram-language": \ed22,
+  "wolfram-mathematica": \ed23,
+  "wordpress": \ed24,
+  "wpengine": \ed25,
+  "x-pack": \ed26,
+  "xbox": \ed27,
+  "xcode": \ed28,
+  "xero": \ed29,
+  "xiaomi": \ed2a,
+  "xing": \ed2b,
+  "xrp": \ed2c,
+  "xsplit": \ed2d,
+  "y-combinator": \ed2e,
+  "yahoo": \ed2f,
+  "yammer": \ed30,
+  "yandex": \ed31,
+  "yarn": \ed32,
+  "yelp": \ed33,
+  "youtube": \ed34,
+  "zalando": \ed35,
+  "zapier": \ed36,
+  "zeit": \ed37,
+  "zendesk": \ed38,
+  "zerply": \ed39,
+  "zillow": \ed3a,
+  "zingat": \ed3b,
+  "zoom": \ed3c,
+  "zorin": \ed3d,
+  "zulip": \ed3e,
 ) !default;
\ No newline at end of file
diff --git a/scss/flag/flag-icons.scss b/scss/flag.scss
similarity index 72%
rename from scss/flag/flag-icons.scss
rename to scss/flag.scss
index e679e0b3c..a5bba758a 100755
--- a/scss/flag/flag-icons.scss
+++ b/scss/flag.scss
@@ -6,6 +6,6 @@
  * Licensed under CC0 1.0 Universal
  */
 
-@import "variables";
-@import "functions";
-@import "core";
+@import "flag/variables";
+@import "flag/functions";
+@import "flag/core";
diff --git a/scss/flag/_core.scss b/scss/flag/_core.scss
index d108f1078..b57376bb5 100644
--- a/scss/flag/_core.scss
+++ b/scss/flag/_core.scss
@@ -11,6 +11,6 @@
 @each $icon, $unicode in $icons {
   $icon-lower: to-lower-case(#{$icon});
   .#{$coreui-icons-prefix}#{$icon-lower} {
-    background-image: url(../svg/flag/#{$coreui-icons-prefix}#{$icon}.svg);
+    background-image: url(#{$coreui-flag-icons-path}/#{$coreui-icons-prefix}#{$icon}.svg);
   }
 }
diff --git a/scss/flag/_variables.scss b/scss/flag/_variables.scss
index af424f502..1379f36bb 100755
--- a/scss/flag/_variables.scss
+++ b/scss/flag/_variables.scss
@@ -1,4 +1,5 @@
 $coreui-icons-prefix: "cif-" !default;
+$coreui-flag-icons-path: "../svg/flag" !default;
 
 $icons: (
   "AD",
@@ -35,6 +36,7 @@ $icons: (
   "CG",
   "CH",
   "CI",
+  "CK",
   "CL",
   "CM",
   "CN",
@@ -191,6 +193,7 @@ $icons: (
   "VA",
   "VC",
   "VE",
+  "VG",
   "VN",
   "WS",
   "XK",
diff --git a/scss/free/free-icons.scss b/scss/free.scss
similarity index 74%
rename from scss/free/free-icons.scss
rename to scss/free.scss
index 8271489cc..5ad5018c4 100755
--- a/scss/free/free-icons.scss
+++ b/scss/free.scss
@@ -6,7 +6,7 @@
  * Licensed under MIT (https://coreui.io/icons/license)
  */
 
-@import "variables";
-@import "functions";
-@import "core";
+@import "free/variables";
+@import "free/functions";
+@import "free/core";
  
\ No newline at end of file