diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index c800605548b..a7607d00a37 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -269,7 +269,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
                     aria-label={t("edit_cover_photo")}
                   >
                     <CareIcon
-                      icon="l-edit"
+                      icon="l-pen"
                       className="text-white"
                       aria-hidden="true"
                     />
@@ -290,7 +290,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
                       className="cursor-pointer mt-2 [@media(max-width:25rem)]:mt-12 [@media(max-width:25rem)]:w-full"
                       variant="outline"
                     >
-                      <CareIcon icon="l-edit" />
+                      <CareIcon icon="l-pen" />
                       {t("edit_facility_details")}
                     </Button>
                   }
diff --git a/src/components/Patient/allergy/list.tsx b/src/components/Patient/allergy/list.tsx
index 4e4fe877a90..e65a630de03 100644
--- a/src/components/Patient/allergy/list.tsx
+++ b/src/components/Patient/allergy/list.tsx
@@ -301,9 +301,9 @@ const AllergyListLayout = ({
         {facilityId && encounterId && (
           <Link
             href={`/facility/${facilityId}/patient/${patientId}/encounter/${encounterId}/questionnaire/allergy_intolerance`}
-            className="flex items-center gap-1 text-sm hover:text-gray-500 text-gray-950 underline"
+            className="flex items-center gap-1 text-sm hover:text-gray-500 text-gray-950"
           >
-            <CareIcon icon="l-edit" className="w-4 h-4" />
+            <CareIcon icon="l-pen" className="w-4 h-4" />
             {t("edit")}
           </Link>
         )}
diff --git a/src/components/Patient/diagnosis/list.tsx b/src/components/Patient/diagnosis/list.tsx
index cb682456b02..d1efbc8ee53 100644
--- a/src/components/Patient/diagnosis/list.tsx
+++ b/src/components/Patient/diagnosis/list.tsx
@@ -144,9 +144,9 @@ const DiagnosisListLayout = ({
         {facilityId && encounterId && (
           <Link
             href={`/facility/${facilityId}/patient/${patientId}/encounter/${encounterId}/questionnaire/diagnosis`}
-            className="flex items-center gap-1 text-sm hover:text-gray-500 text-gray-950 underline"
+            className="flex items-center gap-1 text-sm hover:text-gray-500 text-gray-950"
           >
-            <CareIcon icon="l-edit" className="w-4 h-4" />
+            <CareIcon icon="l-pen" className="w-4 h-4" />
             {t("edit")}
           </Link>
         )}
diff --git a/src/components/Patient/symptoms/list.tsx b/src/components/Patient/symptoms/list.tsx
index 891154584f1..4b5d9d3a0f0 100644
--- a/src/components/Patient/symptoms/list.tsx
+++ b/src/components/Patient/symptoms/list.tsx
@@ -135,9 +135,9 @@ const SymptomListLayout = ({
         {facilityId && encounterId && (
           <Link
             href={`/facility/${facilityId}/patient/${patientId}/encounter/${encounterId}/questionnaire/symptom`}
-            className="flex items-center gap-1 text-sm hover:text-gray-500 text-gray-950 underline"
+            className="flex items-center gap-1 text-sm hover:text-gray-500 text-gray-950"
           >
-            <CareIcon icon="l-edit" className="w-4 h-4" />
+            <CareIcon icon="l-pen" className="w-4 h-4" />
             {t("edit")}
           </Link>
         )}
diff --git a/src/components/Questionnaire/show.tsx b/src/components/Questionnaire/show.tsx
index 6c3fda69b27..62868e5ed67 100644
--- a/src/components/Questionnaire/show.tsx
+++ b/src/components/Questionnaire/show.tsx
@@ -158,7 +158,7 @@ export function QuestionnaireShow({ id }: QuestionnaireShowProps) {
             Back to List
           </Button>
           <Button onClick={() => navigate(`/admin/questionnaire/${id}/edit`)}>
-            <CareIcon icon="l-edit" className="mr-2 h-4 w-4" />
+            <CareIcon icon="l-pen" className="mr-2 h-4 w-4" />
             Edit
           </Button>
           <DropdownMenu>
diff --git a/src/components/Resource/ResourceDetails.tsx b/src/components/Resource/ResourceDetails.tsx
index 182cd9ab514..866f8deb4ab 100644
--- a/src/components/Resource/ResourceDetails.tsx
+++ b/src/components/Resource/ResourceDetails.tsx
@@ -144,7 +144,7 @@ export default function ResourceDetails({
                 navigate(`/facility/${facilityId}/resource/${id}/update`)
               }
             >
-              <CareIcon icon="l-edit" className="mr-2 h-4 w-4" />
+              <CareIcon icon="l-pen" className="mr-2 h-4 w-4" />
               {t("update_status")}
             </Button>
           </div>
diff --git a/src/components/Users/UserResetPassword.tsx b/src/components/Users/UserResetPassword.tsx
index fed51b5d5b3..1511f2d0354 100644
--- a/src/components/Users/UserResetPassword.tsx
+++ b/src/components/Users/UserResetPassword.tsx
@@ -101,7 +101,7 @@ export default function UserResetPassword({
             variant="primary"
           >
             <CareIcon
-              icon={isEditing ? "l-times" : "l-edit"}
+              icon={isEditing ? "l-times" : "l-pen"}
               className="h-4 w-4"
             />
             {t("update_password")}
diff --git a/src/pages/Organization/OrganizationFacilities.tsx b/src/pages/Organization/OrganizationFacilities.tsx
index 346e2b8cd4c..897e04a939b 100644
--- a/src/pages/Organization/OrganizationFacilities.tsx
+++ b/src/pages/Organization/OrganizationFacilities.tsx
@@ -142,7 +142,7 @@ export default function OrganizationFacilities({
                           size="icon"
                           className="text-primary"
                         >
-                          <CareIcon icon="l-edit" className="h-4 w-4" />
+                          <CareIcon icon="l-pen" className="h-4 w-4" />
                           <span className="">{t("edit_facility")}</span>
                         </Button>
                       }