diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
index c17daa00..3fc93995 100644
--- a/packages/toolkit/package.json
+++ b/packages/toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@instill-ai/toolkit",
-  "version": "0.68.3-rc.67",
+  "version": "0.68.3-rc.69",
   "description": "Instill AI's frontend toolkit",
   "repository": "https://github.com/instill-ai/design-system.git",
   "bugs": "https://github.com/instill-ai/design-system/issues",
diff --git a/packages/toolkit/src/view/dashboard/PipelineTriggerCountsLineChart.tsx b/packages/toolkit/src/view/dashboard/PipelineTriggerCountsLineChart.tsx
index f83fa99d..67163a75 100644
--- a/packages/toolkit/src/view/dashboard/PipelineTriggerCountsLineChart.tsx
+++ b/packages/toolkit/src/view/dashboard/PipelineTriggerCountsLineChart.tsx
@@ -154,8 +154,8 @@ export const PipelineTriggerCountsLineChart = ({
                     <Tooltip.Arrow
                       className="fill-semantic-bg-primary"
                       offset={10}
-                      width={18}
-                      height={12}
+                      width={9}
+                      height={6}
                     />
                   </Tooltip.Content>
                 </Tooltip.Portal>
diff --git a/packages/toolkit/src/view/pipeline-builder/components/ReleasePipelineModal.tsx b/packages/toolkit/src/view/pipeline-builder/components/ReleasePipelineModal.tsx
index 776fd0f2..c71ceab1 100644
--- a/packages/toolkit/src/view/pipeline-builder/components/ReleasePipelineModal.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/components/ReleasePipelineModal.tsx
@@ -128,7 +128,7 @@ export const ReleasePipelineModal = (props: ReleasePipelineModalProps) => {
       <Dialog.Trigger asChild>
         <Tooltip.Provider>
           <Tooltip.Root>
-            <Tooltip.Trigger asChild={true}>
+            <Tooltip.Trigger asChild>
               {/* 
                 This will make tooltip work even with a disabled button
                 https://www.radix-ui.com/primitives/docs/components/tooltip#displaying-a-tooltip-from-a-disabled-button
@@ -162,8 +162,8 @@ export const ReleasePipelineModal = (props: ReleasePipelineModalProps) => {
                 <Tooltip.Arrow
                   className="fill-semantic-bg-primary"
                   offset={10}
-                  width={18}
-                  height={12}
+                  width={9}
+                  height={6}
                 />
               </Tooltip.Content>
             </Tooltip.Portal>
diff --git a/packages/toolkit/src/view/pipeline-builder/components/SharePipelineDialog.tsx b/packages/toolkit/src/view/pipeline-builder/components/SharePipelineDialog.tsx
index 8b765b94..08478d61 100644
--- a/packages/toolkit/src/view/pipeline-builder/components/SharePipelineDialog.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/components/SharePipelineDialog.tsx
@@ -132,8 +132,8 @@ export const SharePipelineDialog = (props: SharePipelineDialogProps) => {
                         <Tooltip.Arrow
                           className="fill-semantic-bg-primary"
                           offset={10}
-                          width={18}
-                          height={12}
+                          width={9}
+                          height={6}
                         />
                       </Tooltip.Content>
                     </Tooltip.Portal>
@@ -218,8 +218,8 @@ export const SharePipelineDialog = (props: SharePipelineDialogProps) => {
                           <Tooltip.Arrow
                             className="fill-semantic-bg-primary"
                             offset={10}
-                            width={18}
-                            height={12}
+                            width={9}
+                            height={6}
                           />
                         </Tooltip.Content>
                       </Tooltip.Portal>
diff --git a/packages/toolkit/src/view/pipeline-builder/components/connector-node/ConnectorNode.tsx b/packages/toolkit/src/view/pipeline-builder/components/connector-node/ConnectorNode.tsx
index b7dea9e4..88f404c0 100644
--- a/packages/toolkit/src/view/pipeline-builder/components/connector-node/ConnectorNode.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/components/connector-node/ConnectorNode.tsx
@@ -9,6 +9,7 @@ import {
   Input,
   LinkButton,
   Textarea,
+  Tooltip,
   useToast,
 } from "@instill-ai/design-system";
 import { shallow } from "zustand/shallow";
@@ -41,7 +42,7 @@ import {
   ImageWithFallback,
 } from "../../../../components";
 import { ConnectorNodeControlPanel } from "./ConnectorNodeControlPanel";
-import { ResourceNameTag } from "./ResourceNameTag";
+import { ResourceIDTag } from "./ResourceIDTag";
 
 const pipelineBuilderSelector = (state: PipelineBuilderStore) => ({
   expandAllNodes: state.expandAllNodes,
@@ -525,15 +526,40 @@ export const ConnectorNode = ({ data, id }: NodeProps<ConnectorNodeData>) => {
                 />
               </form>
             </Form.Root>
-            <button
-              onClick={(e) => {
-                e.stopPropagation();
-                connectorIDInputRef.current?.focus();
-              }}
-              type="button"
-            >
-              <Icons.Edit03 className="h-4 w-4 stroke-semantic-fg-primary" />
-            </button>
+            <Tooltip.Provider>
+              <Tooltip.Root>
+                <Tooltip.Trigger asChild>
+                  {/* 
+                eslint-disable-next-line jsx-a11y/no-noninteractive-tabindex
+              */}
+                  <span className="flex" tabIndex={0}>
+                    <button
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        connectorIDInputRef.current?.focus();
+                      }}
+                      type="button"
+                    >
+                      <Icons.Edit03 className="h-4 w-4 stroke-semantic-fg-primary" />
+                    </button>
+                  </span>
+                </Tooltip.Trigger>
+                <Tooltip.Portal>
+                  <Tooltip.Content
+                    side="top"
+                    className="!px-3 !py-2 rounded-sm !product-body-text-4-semibold bg-semantic-bg-primary"
+                  >
+                    Edit the component ID
+                    <Tooltip.Arrow
+                      className="fill-semantic-bg-primary"
+                      offset={10}
+                      width={9}
+                      height={6}
+                    />
+                  </Tooltip.Content>
+                </Tooltip.Portal>
+              </Tooltip.Root>
+            </Tooltip.Provider>
           </div>
           {isLatestVersion && isOwner ? (
             <ConnectorNodeControlPanel
@@ -946,7 +972,13 @@ export const ConnectorNode = ({ data, id }: NodeProps<ConnectorNodeData>) => {
           </>
         )}
         <div className="flex flex-row-reverse">
-          <ResourceNameTag resourceName={data.component.resource_name} />
+          <ResourceIDTag
+            resourceID={
+              data.component.resource_name
+                ? data.component.resource_name.split("/")[3]
+                : null
+            }
+          />
         </div>
       </div>
       <CustomHandle
diff --git a/packages/toolkit/src/view/pipeline-builder/components/connector-node/ResourceNameTag.tsx b/packages/toolkit/src/view/pipeline-builder/components/connector-node/ResourceIDTag.tsx
similarity index 87%
rename from packages/toolkit/src/view/pipeline-builder/components/connector-node/ResourceNameTag.tsx
rename to packages/toolkit/src/view/pipeline-builder/components/connector-node/ResourceIDTag.tsx
index f8ad5737..9920e746 100644
--- a/packages/toolkit/src/view/pipeline-builder/components/connector-node/ResourceNameTag.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/components/connector-node/ResourceIDTag.tsx
@@ -1,12 +1,12 @@
 import { Tag, Tooltip } from "@instill-ai/design-system";
 import { Nullable } from "../../../../lib";
 
-export const ResourceNameTag = ({
-  resourceName,
+export const ResourceIDTag = ({
+  resourceID,
 }: {
-  resourceName: Nullable<string>;
+  resourceID: Nullable<string>;
 }) => {
-  const resourceID = resourceName ? resourceName.split("/")[3] : null;
+  // const resourceID = resourceName ? resourceName.split("/")[3] : null;
 
   return resourceID ? (
     <Tooltip.Provider>
@@ -28,7 +28,7 @@ export const ResourceNameTag = ({
           >
             <div className="flex flex-col gap-y-1 text-left">
               <p className="product-body-text-4-semibold bg-semantic-bg-primary">
-                resource name
+                resource ID
               </p>
               <p className="product-body-text-4-regular break-words text-semantic-fg-secondary">
                 {resourceID}
diff --git a/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/NumbersField.tsx b/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/NumbersField.tsx
index c069041b..60207f5a 100644
--- a/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/NumbersField.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/NumbersField.tsx
@@ -8,12 +8,12 @@ export const NumbersField = (props: {
   title: string;
 }) => {
   const [numberFieldsArray, setNumberFieldsArray] = React.useState<number[]>([
-    1, 1,
+    1,
   ]);
 
   const [numberFieldsValue, setNumberFieldsValue] = React.useState<
     (string | undefined)[]
-  >(["", ""]);
+  >([""]);
 
   const { form, fieldKey, title } = props;
   return (
diff --git a/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/TextsField.tsx b/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/TextsField.tsx
index a16637d3..08720174 100644
--- a/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/TextsField.tsx
+++ b/packages/toolkit/src/view/pipeline-builder/use-node-input-fields/TextsField.tsx
@@ -7,13 +7,11 @@ export const TextsField = (props: {
   fieldKey: string;
   title: string;
 }) => {
-  const [textFieldsArray, setTextFieldsArray] = React.useState<number[]>([
-    1, 1,
-  ]);
+  const [textFieldsArray, setTextFieldsArray] = React.useState<number[]>([1]);
 
   const [textFieldsValue, setTextFieldsValue] = React.useState<
     (string | undefined)[]
-  >(["", ""]);
+  >([""]);
 
   const { form, fieldKey, title } = props;
   return (