diff --git a/client/public/locales/en/translation.json b/client/public/locales/en/translation.json
index cefc254ccc..854305c3c1 100644
--- a/client/public/locales/en/translation.json
+++ b/client/public/locales/en/translation.json
@@ -214,7 +214,8 @@
     "taskInProgressForTags": "A new analysis is in-progress.  Tags may be updated upon completion.",
     "toTagApplication": "Either no tags exist yet or you may not have permission to view any. If you have permission, try creating a new custom tag.",
     "unsavedChanges": "Are you sure you want to close the assessment? Any unsaved changes will be lost.",
-    "noAnswers": "Are you sure you want to close the assessment? There are no answers to save."
+    "noAnswers": "Are you sure you want to close the assessment? There are no answers to save.",
+    "unlinkTicket": "Unlink from Jira"
   },
   "proposedActions": {
     "refactor": "Refactor",
@@ -308,7 +309,7 @@
     "date": "Date",
     "decision": "Decision",
     "dependencies": "Dependencies",
-    "dependentQuestion": "Dependent question",
+    "dependentQuestion": "Conditional question",
     "description": "Description",
     "details": "Details",
     "displayName": "Display name",
diff --git a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx
index fd1a083491..b90a99f132 100644
--- a/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx
+++ b/client/src/app/pages/applications/components/application-detail-drawer/application-detail-fields.tsx
@@ -9,6 +9,7 @@ import {
   Grid,
   GridItem,
   Spinner,
+  Tooltip,
 } from "@patternfly/react-core";
 import { Application } from "@app/api/models";
 import spacing from "@patternfly/react-styles/css/utilities/Spacing/spacing";
@@ -187,11 +188,17 @@ export const ApplicationDetailFields: React.FC<{
           isLoading ? (
             <Spinner role="status" size="sm" />
           ) : (
-            <Button
-              variant="link"
-              icon={<UnlinkIcon />}
-              onClick={() => deleteTicket(matchingTicket.id)}
-            />
+            <Tooltip
+              content={t("message.unlinkTicket")}
+              position="top"
+              entryDelay={1000}
+            >
+              <Button
+                variant="link"
+                icon={<UnlinkIcon />}
+                onClick={() => deleteTicket(matchingTicket.id)}
+              />
+            </Tooltip>
           )
         ) : null}
       </Text>
diff --git a/client/src/app/pages/migration-waves/components/wave-status-table.tsx b/client/src/app/pages/migration-waves/components/wave-status-table.tsx
index e26b28267b..c2e9c2f08b 100644
--- a/client/src/app/pages/migration-waves/components/wave-status-table.tsx
+++ b/client/src/app/pages/migration-waves/components/wave-status-table.tsx
@@ -9,6 +9,7 @@ import {
   Toolbar,
   ToolbarContent,
   ToolbarItem,
+  Tooltip,
 } from "@patternfly/react-core";
 import { Table, Tbody, Td, Th, Thead, Tr } from "@patternfly/react-table";
 import alignment from "@patternfly/react-styles/css/utilities/Alignment/alignment";
@@ -165,11 +166,17 @@ export const WaveStatusTable: React.FC<IWaveStatusTableProps> = ({
                     </Td>
                     <Td className={alignment.textAlignRight}>
                       {ticket?.id && (
-                        <Button
-                          variant="link"
-                          icon={<UnlinkIcon />}
-                          onClick={() => deleteTicket(ticket.id)}
-                        />
+                        <Tooltip
+                          content={t("message.unlinkTicket")}
+                          position="top"
+                          entryDelay={1000}
+                        >
+                          <Button
+                            variant="link"
+                            icon={<UnlinkIcon />}
+                            onClick={() => deleteTicket(ticket.id)}
+                          />
+                        </Tooltip>
                       )}
                       <Button
                         type="button"