diff --git a/src/frontend/src/CustomNodes/GenericNode/index.tsx b/src/frontend/src/CustomNodes/GenericNode/index.tsx
index 80e5ad0f7..ddfc04aef 100644
--- a/src/frontend/src/CustomNodes/GenericNode/index.tsx
+++ b/src/frontend/src/CustomNodes/GenericNode/index.tsx
@@ -44,6 +44,7 @@ export default function GenericNode({
   const buildFlow = useFlowStore((state) => state.buildFlow);
   const setNode = useFlowStore((state) => state.setNode);
   const name = nodeIconsLucide[data.type] ? data.type : types[data.type];
+  console.log(types[data.type])
   const [inputName, setInputName] = useState(false);
   const [nodeName, setNodeName] = useState(data.node!.display_name);
   const [inputDescription, setInputDescription] = useState(false);
@@ -157,7 +158,7 @@ export default function GenericNode({
     const iconElement = data?.node?.icon;
     const iconColor = nodeColors[types[data.type]];
     const iconName =
-      iconElement || (data.node?.flow ? "group_components" : name);
+    iconElement || (data.node?.flow ? "group_components" : name);
     const iconClassName = `generic-node-icon ${
       !showNode ? " absolute inset-x-6 h-12 w-12 " : ""
     }`;
diff --git a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/utils.tsx b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/utils.tsx
index 6261e87bb..f8b5a0af9 100644
--- a/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/utils.tsx
+++ b/src/frontend/src/pages/FlowPage/components/extraSidebarComponent/utils.tsx
@@ -4,9 +4,10 @@ export function sortKeys(a: string, b: string) {
     "saved_components",
     "inputs",
     "outputs",
+    "prompts",
     "data",
-    "utilities",
     "models",
+    "utilities",
   ];
   const indexA = order.indexOf(a.toLowerCase());
   const indexB = order.indexOf(b.toLowerCase());
diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
index 0dc36eac7..8733e4528 100644
--- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx
@@ -219,7 +219,7 @@ export default function NodeToolbarComponent({
                 }}
                 data-testid="code-button-modal"
               >
-                <IconComponent name="TerminalSquare" className="h-4 w-4" />
+                <IconComponent name="Code" className="h-4 w-4" />
               </button>
             </ShadTooltip>
           ) : (
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index 601066407..dc7115838 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -3,11 +3,13 @@ import {
   ArrowLeft,
   ArrowUpToLine,
   Bell,
+  Binary,
   BookMarked,
   BookmarkPlus,
   Bot,
   Boxes,
   Braces,
+  BrainCircuit,
   Check,
   CheckCircle2,
   ChevronDown,
@@ -28,6 +30,7 @@ import {
   Compass,
   Copy,
   Cpu,
+  Database,
   Delete,
   Download,
   DownloadCloud,
@@ -40,6 +43,7 @@ import {
   FileDown,
   FileSearch,
   FileSearch2,
+  FileSliders,
   FileText,
   FileType2,
   FileUp,
@@ -79,12 +83,14 @@ import {
   MoonIcon,
   MoreHorizontal,
   Network,
+  Package2,
   Paperclip,
   Pencil,
   PencilLine,
   Pin,
   Play,
   Plus,
+  PocketKnife,
   Redo,
   RefreshCcw,
   Repeat,
@@ -120,6 +126,7 @@ import {
   UserPlus2,
   Users2,
   Variable,
+  Wand,
   Wand2,
   Workflow,
   Wrench,
@@ -242,7 +249,7 @@ export const nodeNames: { [char: string]: string } = {
   outputs: "Outputs",
   data: "Data",
   prompts: "Prompts",
-  models: "Language Models",
+  models: "Models",
   model_specs: "Model Specs",
   chains: "Chains",
   agents: "Agents",
@@ -258,8 +265,8 @@ export const nodeNames: { [char: string]: string } = {
   wrappers: "Wrappers",
   textsplitters: "Text Splitters",
   retrievers: "Retrievers",
-  utilities: "Utilities",
-  langchain_utilities: "Langchain Utilities",
+  utilities: "Helpers",
+  langchain_utilities: "Utilities",
   output_parsers: "Output Parsers",
   custom_components: "Custom",
   unknown: "Other",
@@ -268,7 +275,7 @@ export const nodeNames: { [char: string]: string } = {
 export const nodeIconsLucide: iconsType = {
   inputs: Download,
   outputs: Upload,
-  data: FolderOpen,
+  data: Database,
   AzureChatOpenAi: AzureIcon,
   Ollama: OllamaIcon,
   ChatOllama: OllamaIcon,
@@ -331,27 +338,27 @@ export const nodeIconsLucide: iconsType = {
   VertexAIEmbeddings: VertexAIIcon,
   Share3: ShareIcon,
   Share4: Share2Icon,
-  agents: Rocket,
+  agents: Bot,
   Workflow,
   User,
   WikipediaAPIWrapper: SvgWikipedia,
   chains: Link,
   memories: Cpu,
-  models: Bot,
-  model_specs: Lightbulb,
+  models: BrainCircuit,
+  model_specs: FileSliders,
   prompts: TerminalSquare,
-  tools: Wrench,
+  tools: Hammer,
   advanced: Laptop2,
   chat: MessageCircle,
-  embeddings: Fingerprint,
+  embeddings: Binary,
   saved_components: GradientSave,
   documentloaders: Paperclip,
   vectorstores: Layers,
-  toolkits: Hammer,
+  toolkits: Package2,
   textsplitters: Scissors,
   wrappers: Gift,
   utilities: Wand2,
-  langchain_utilities: Wand2,
+  langchain_utilities: PocketKnife,
   WolframAlphaAPIWrapper: SvgWolfram,
   output_parsers: Compass,
   retrievers: FileSearch,