diff --git a/icons/icon-info.json b/icons/icon-info.json
index 02a5fef..dc1058e 100644
--- a/icons/icon-info.json
+++ b/icons/icon-info.json
@@ -764,11 +764,11 @@
         "notes": ""
     },
     "role": {
-        "uses": "role, user",
-        "notes": ""
+        "uses": "role, user, checkmark, generic, user, person",
+        "notes": "Generic Role"
     },
     "role_manage": {
-        "uses": "",
+        "uses": "role, manage, cog, gear, user, person",
         "notes": ""
     },
     "all_users": {
@@ -956,7 +956,7 @@
         "notes": ""
     },
     "password_role_based": {
-        "uses": "",
+        "uses": "password, role, user, person",
         "notes": ""
     },
     "search_advanced": {
@@ -1307,6 +1307,10 @@
         "uses": "code, slash",
         "notes": ""
     },
+    "code_js": {
+        "uses": "code, javascript",
+        "notes": ""
+    },
     "native_code": {
         "uses": "code, slash, box",
         "notes": ""
@@ -1544,15 +1548,15 @@
         "notes": ""
     },
     "dir_rbsRole2": {
-        "uses": "check",
+        "uses": "role, checkmark, user, person",
         "notes": ""
     },
     "dir_rbsScope": {
-        "uses": "check",
+        "uses": "scope, check",
         "notes": ""
     },
     "dir_rbsScope2": {
-        "uses": "check",
+        "uses": "scope, check",
         "notes": ""
     },
     "dir_rbsTask": {
@@ -1910,5 +1914,57 @@
     "hide_private": {
         "uses": "hide, show, private, hidden",
         "notes": ""
+    },
+    "CyberRes_ArcSight": {
+        "uses": "cyberres, arcsight, branding",
+        "notes": ""
+    },
+    "CyberRes_Fortify": {
+        "uses": "cyberres, fortify, branding",
+        "notes": ""
+    },
+    "CyberRes_NetIQ": {
+        "uses": "cyberres, netiq, branding",
+        "notes": ""
+    },
+    "CyberRes_Voltage": {
+        "uses": "cyberres, voltage, branding",
+        "notes": ""
+    },
+    "user_deleted": {
+        "uses": "user, person, delete, status",
+        "notes": ""
+    },
+    "role_admin": {
+        "uses": "role, admin, server, monitor, user, person",
+        "notes": ""
+    },
+    "role_business": {
+        "uses": "role, business, graph, user, person",
+        "notes": ""
+    },
+    "role_management": {
+        "uses": "role, manage, tie, user, person",
+        "notes": ""
+    },
+    "role_security": {
+        "uses": "role, secure, shield, lock, user, person",
+        "notes": ""
+    },
+    "role_support": {
+        "uses": "role, support, pencil, user, person",
+        "notes": ""
+    },
+    "role_tech": {
+        "uses": "role, technical, circuit board, user, person",
+        "notes": ""
+    },
+    "role_cloud": {
+        "uses": "role, cloud, user, person",
+        "notes": ""
+    },
+    "role_service": {
+        "uses": "role, service, wrench, cog, gear, user, person",
+        "notes": ""
     }
 }
diff --git a/icons/uE9A4-download_thick.svg b/icons/uE9A4-download_thick.svg
index b115457..f5137c2 100644
--- a/icons/uE9A4-download_thick.svg
+++ b/icons/uE9A4-download_thick.svg
@@ -1 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72"><title>m</title><polygon points="50.91 30.78 38.04 43.65 38.04 8.89 34.04 8.89 34.04 43.65 21.17 30.78 18.34 33.6 36.04 51.31 53.74 33.6 50.91 30.78" fill="gray"/><path d="M11,18v42.5a0.67,0.67,0,0,0,.66.67h48.6A0.67,0.67,0,0,0,61,60.46V18h4v42.5a4.67,4.67,0,0,1-4.66,4.67H11.69A4.67,4.67,0,0,1,7,60.46V18h4Z" fill="gray"/><rect x="0.36" y="0.36" width="71.28" height="71.28" fill="none"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72" >
+    <polygon class="st0" points="50.9,30.8 38,43.7 38,8.9 34,8.9 34,43.7 21.2,30.8 18.3,33.6 36,51.3 53.7,33.6 "/>
+    <path class="st0" d="M11,23v37.5c0,0.4,0.3,0.7,0.7,0.7h48.6c0.4,0,0.7-0.2,0.7-0.6c0,0,0-0.1,0-0.1V23h4v37.5
+	    c0,2.6-2.1,4.7-4.7,4.7H11.7c-2.6,0-4.7-2.1-4.7-4.6c0,0,0,0,0-0.1V23H11z"/>
+</svg>
diff --git a/icons/uE9A4-upload.svg b/icons/uE9A4-upload.svg
new file mode 100644
index 0000000..adcd508
--- /dev/null
+++ b/icons/uE9A4-upload.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72" >
+    <polygon class="st0" points="53.7,26.6 36,8.9 18.3,26.6 21.2,29.4 34,16.5 34,51.3 38,51.3 38,16.5 50.9,29.4 "/>
+    <path class="st0" d="M11,23v37.5c0,0.4,0.3,0.7,0.7,0.7h48.6c0.4,0,0.7-0.2,0.7-0.6c0,0,0-0.1,0-0.1V23h4v37.5
+	c0,2.6-2.1,4.7-4.7,4.7H11.7c-2.6,0-4.7-2.1-4.7-4.6c0,0,0,0,0-0.1V23H11z"/>
+</svg>
diff --git a/icons/ueb82-import.svg b/icons/ueb82-import.svg
new file mode 100644
index 0000000..e9148d1
--- /dev/null
+++ b/icons/ueb82-import.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72" >
+    <path class="st0" d="M11,30.5v30c0,0.4,0.3,0.7,0.7,0.7h48.6c0.4,0,0.7-0.2,0.7-0.6c0,0,0-0.1,0-0.1v-30h4v30c0,2.6-2.1,4.7-4.7,4.7
+	    H11.7c-2.6,0-4.7-2.1-4.7-4.6c0,0,0,0,0-0.1v-30H11z"/>
+	<path class="st0" d="M36.1,48.7c-0.4,0-0.8-0.2-1.1-0.4L18.6,31.8c-0.4-0.4-0.6-1.1-0.3-1.6c0.2-0.6,0.8-0.9,1.4-0.9h9.2V7.2h3
+		v23.6c0,0.8-0.7,1.5-1.5,1.5h-7.1l12.8,12.8l12.8-12.8h-7c-0.8,0-1.5-0.7-1.5-1.5V7.2h3v22.1h9.1c0.6,0,1.2,0.4,1.4,0.9
+		s0.1,1.2-0.3,1.6L37.1,48.3C36.8,48.5,36.5,48.7,36.1,48.7z"/>
+</svg>
diff --git a/icons/ueb83-export.svg b/icons/ueb83-export.svg
new file mode 100644
index 0000000..4353209
--- /dev/null
+++ b/icons/ueb83-export.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 72 72" >
+    <path class="st0" d="M11,30.5v30c0,0.4,0.3,0.7,0.7,0.7h48.6c0.4,0,0.7-0.2,0.7-0.6v-0.1v-30h4v30c0,2.6-2.1,4.7-4.7,4.7H11.7
+	    c-2.6,0-4.7-2.1-4.7-4.6c0,0,0,0,0-0.1v-30C7,30.5,11,30.5,11,30.5z"/>
+	<path class="st0" d="M43.3,47.2h-3V23.6c0-0.8,0.7-1.5,1.5-1.5h7L36.1,9.3L23.3,22.1h7.1c0.8,0,1.5,0.7,1.5,1.5v23.6h-3V25.1h-9.2
+		c-0.6,0-1.2-0.4-1.4-0.9c-0.2-0.6-0.1-1.2,0.3-1.6L35,6.1c0.3-0.3,0.7-0.4,1.1-0.4c0,0,0,0,0,0c0.4,0,0.8,0.2,1.1,0.4l16.3,16.4
+		c0.4,0.4,0.6,1.1,0.3,1.6s-0.8,0.9-1.4,0.9h-9.1V47.2z"/>
+</svg>