diff --git a/frontend/components/basic/dialog/AddIncidentContactDialog.js b/frontend/components/basic/dialog/AddIncidentContactDialog.js
index 28c6ee968..d4929720f 100644
--- a/frontend/components/basic/dialog/AddIncidentContactDialog.js
+++ b/frontend/components/basic/dialog/AddIncidentContactDialog.js
@@ -82,7 +82,7 @@ const AddIncidentContactDialog = ({
                     <Button
                       onButtonPressed={submit}
                       color="mineshaft"
-                      text={t("section-incident.add-dialog.add-incident")}
+                      text={t("section-incident:add-dialog.add-incident")}
                       size="md"
                     />
                   </div>
diff --git a/frontend/locales/en-US.json b/frontend/locales/en-US.json
index d8057d398..4dc57a519 100644
--- a/frontend/locales/en-US.json
+++ b/frontend/locales/en-US.json
@@ -20,18 +20,10 @@
     "role": "Role",
     "role_admin": "admin",
     "display-name": "Display Name",
-    "free": "Free",
-    "starter": "Starter",
-    "professional": "Professional",
-    "enterprise": "Enterprise",
-    "downgrade": "Downgrade",
-    "upgrade": "Upgrade",
-    "learn-more": "Learn More",
-    "custom-pricing": "Custom Pricing",
-    "schedule-demo": "Schedule a Demo",
     "environment": "Environment",
     "expired-in": "Expires in",
-    "language": "Language"
+    "language": "Language",
+    "search": "Search..."
   },
   "form-password": {
     "password": "Password",
@@ -96,12 +88,9 @@
     "step4-download": "Download PDF"
   },
   "dashboard": {
-    "secrets": "Secrets",
-    "meta": {
-      "title": "Dashboard | Infiscal",
-      "og-title": "Manage your .env files in seconds",
-      "og-description": "Infisical a simple end-to-end encrypted platform that enables teams to sync and manage their .env files."
-    },
+    "title": "Secrets",
+    "og-title": "Manage your .env files in seconds",
+    "og-description": "Infisical a simple end-to-end encrypted platform that enables teams to sync and manage their .env files.",
     "search-keys": "Search keys...",
     "add-key": "Add Key",
     "personal": "Personal",
@@ -162,28 +151,33 @@
       "copy-service-token-description": "Once you close this popup, you will never see your service token again"
     }
   },
-  "settings": {
-    "search": "Search...",
-    "delete-project": "Delete Project"
-  },
   "billing": {
     "title": "Usage & Billing",
     "description": "View and manage your organization's subscription here",
     "subscription": "Subscription",
     "starter": {
+      "name": "Starter",
       "price-explanation": "up to 5 team members",
       "text": "Manage any project with 5 members for free!",
       "subtext": "$5 per member/month afterwards."
     },
     "professional": {
+      "name": "Professional",
       "price-explanation": "/member/month",
       "subtext": "Includes unlimited projects & members.",
       "text": "Keep up with key management as you grow."
     },
     "enterprise": {
+      "name": "Enterprise",
       "text": "Keep up with key management as you grow."
     },
-    "current-usage": "Current Usage"
+    "current-usage": "Current Usage",
+    "free": "Free",
+    "downgrade": "Downgrade",
+    "upgrade": "Upgrade",
+    "learn-more": "Learn More",
+    "custom-pricing": "Custom Pricing",
+    "schedule-demo": "Schedule a Demo"
   },
   "section-members": {
     "add-member": "Add Member",
diff --git a/frontend/locales/ko-KR.json b/frontend/locales/ko-KR.json
index 4b34e974c..e76d68825 100644
--- a/frontend/locales/ko-KR.json
+++ b/frontend/locales/ko-KR.json
@@ -3,35 +3,27 @@
     "head-title": "{{title}} | Infiscal",
     "error_project-already-exists": "A project with this name already exists.",
     "no-mobile": " To use Infisical, please log in through a device with larger dimensions. ",
-    "email": "Email",
-    "password": "Password",
-    "first-name": "First Name",
-    "last-name": "Last Name",
-    "logout": "Log Out",
-    "validate-required": "Please input your {{name}}",
+    "email": "메일",
+    "password": "비밀번호",
+    "first-name": "이름",
+    "last-name": "성",
+    "logout": "로그아웃",
+    "validate-required": "{{name}} 을/를 입력하세요.",
     "maintenance-alert": "We are experiencing minor technical difficulties. We are working on solving it right now. Please come back in a few minutes.",
-    "click-to-copy": "Click to copy",
-    "project-id": "Project ID",
-    "project-id-description": "To integrate Infisical into your code base and get automatic injection of environmental variables, you should use the following Project ID.",
-    "save-changes": "Save Changes",
-    "saved": "Saved",
-    "drop-zone": "Drag and drop your .env file here.",
-    "drop-zone-keys": "Drag and drop your .env file here to add more keys.",
+    "click-to-copy": "클릭하여 복사하기",
+    "project-id": "프로젝트 ID",
+    "save-changes": "변경사항 저장하기",
+    "saved": "저장됨",
+    "drop-zone": ".env 파일을 이곳에 드래그 & 드롭 하세요.",
+    "drop-zone-keys": "이곳에 .env 파일을 드래그 & 드롭 하여 더 많은 키들을 추가하세요.",
     "role": "Role",
     "role_admin": "admin",
-    "display-name": "Display Name",
-    "free": "Free",
-    "starter": "Starter",
-    "professional": "Professional",
-    "enterprise": "Enterprise",
-    "downgrade": "Downgrade",
-    "upgrade": "Upgrade",
-    "learn-more": "Learn More",
-    "custom-pricing": "Custom Pricing",
-    "schedule-demo": "Schedule a Demo",
+    "display-name": "표시 이름",
+
     "environment": "환경",
     "expired-in": "만료 기한:",
-    "language": "언어"
+    "language": "언어",
+    "search": "검색하기..."
   },
   "form-password": {
     "password": "비밀번호",
@@ -76,11 +68,11 @@
   },
   "signup": {
     "title": "회원가입",
-    "og-title": "Replace .env files with 1 line of code. Sign Up for Infisical in 3 minutes.",
-    "og-description": "Infisical a simple end-to-end encrypted platform that enables teams to sync and manage API-keys and environemntal variables.  Works with Node.js, Next.js, Gatsby, Nest.js...",
+    "og-title": "한줄의 코드르 .env파일을 교체하세요. 3분이면 가입할 수 있어요.",
+    "og-description": "Infisical은 팀원과 .env파일을 공유하고 연동할 수 있는 심플한 end-to-end 암호화 플렛폼입니다. Node.js, Next.js, Gatsby, Nest.js 와 같은 다양한 플렛폼에서 작동해요.",
     "signup": "회원가입",
-    "already-have-account": "Have an account? Log in",
-    "forgot-password": "Forgot your password?",
+    "already-have-account": "이미 계정이 있나요? 로그인하기",
+    "forgot-password": "비밀번호를 잊으셨나요?",
     "verify": "인증",
     "step1-start": "시작하기",
     "step1-privacy": "회원가입시 약관과 개인 정보 보호 정책을 읽고 동의한 것으로 간주합니다.",
@@ -96,25 +88,22 @@
     "step4-download": "PDF 다운로드"
   },
   "dashboard": {
-    "secrets": "시크릿",
-    "meta": {
-      "title": "Dashboard | Infiscal",
-      "og-title": "Manage your .env files in seconds",
-      "og-description": "Infisical a simple end-to-end encrypted platform that enables teams to sync and manage their .env files."
-    },
-    "search-keys": "Search keys...",
-    "add-key": "Add Key",
-    "personal": "Personal",
-    "personal-description": "Personal keys are only visible to you",
-    "shared": "Shared",
-    "shared-description": "Shared keys are visible to your whole team",
-    "make-shared": "Make Shared",
-    "make-personal": "Make Personal",
+    "title": "시크릿",
+    "og-title": "빠르게 .env 파일을 관리하세요",
+    "og-description": "Infisical은 팀원과 .env파일을 공유할 수 있는 심플한 end-to-end 암호화 플렛폼입니다.",
+    "search-keys": "키 검색하기...",
+    "add-key": "키 추가하기",
+    "personal": "개인",
+    "personal-description": "개인 키는 오직 본인만 볼 수 있어요",
+    "shared": "공유",
+    "shared-description": "공유 키는 팀 전체가 볼 수 있어요",
+    "make-shared": "공유로 만들기",
+    "make-personal": "개인으로 만들기",
     "check-docs": {
-      "button": "Check Docs",
-      "title": "Good job!",
-      "line1": "Congrats on adding more secrets.",
-      "line2": "Here is how to connect them to your codebase."
+      "button": "문서 확인하기",
+      "title": "좋았어요!",
+      "line1": "더 많은 시크릿들을 추가한 것을 축하합니다.",
+      "line2": "코드와 연결하는 사용하는 방법을 한번 알아보지 않을래요?"
     }
   },
   "settings-members": {
@@ -138,43 +127,44 @@
   },
   "settings-project": {
     "title": "프로젝트 설정",
-    "description": "현재 선택한 프로젝트에 대해서만 설정해요."
-  },
-  "settings": {
-    "search-members": "Search members...",
-    "search": "Search...",
-    "add-member": "Add Member",
-    "org-members": "Organization Members",
-    "org-members-description": "Manage members of your organization. These users could afterwards be formed into projects.",
-    "incident-contacts": "Incident Contacts",
-    "incident-contacts-description": "These contacts will be notified in the unlikely event of a severe incident.",
-    "no-incident-contacts": "No incident contacts found.",
-    "add-contact": "Add Contact",
-    "delete-project": "Delete Project",
-    "delete-project-note": "Note: You can only delete a project in case you have more than one",
-    "project-danger-zone-note": "As soon as you delete this project, you will not be able to undo it. This will immediately remove all the keys. If you still want to do that, please enter the name of the project below.",
-    "danger-zone": "Danger Zone",
-    "service-tokens": "Service Tokens",
-    "service-tokens-description": "Every service token is specific to you, a certain project and a certain environment within this project."
+    "description": "현재 선택한 프로젝트에 대해서 설정해요.",
+    "auto-generated": "자동으로 생성된 고유한 키 입니다. 변경할 수 없어요.",
+    "danger-zone": "위험존",
+    "danger-zone-note": "프로젝트를 삭제한다면 모든 키가 즉시 삭제되며 다시는 되돌릴 수 없어요. 삭제를 원한다면 프로젝트 이름을 아래에 적어주세요.",
+    "delete-project": "프로젝트 삭제",
+    "delete-project-note": "노트: 최소 한개 이상의 프로젝트는 조직에 존재해야 해요.",
+    "docs": "Infisical 문서",
+    "project-id-description": "다른 코드에서 Infisical과 환경변수를 연동하기 위해서는 프로젝트 ID가 필요해요.",
+    "project-id-description2": "다양한 언어 및 프레임워크에 대한 가이드를 확인하고 싶다면, 다음을 확인하세요. ",
+    "project-to-delete": "삭제할 프로젝트"
   },
   "billing": {
     "title": "요금제 & 결제",
     "description": "이곳에서 조직의 구독을 확인하고 관리할 수 있어요.",
     "subscription": "구독",
     "starter": {
+      "name": "스타터",
       "price-explanation": "5명의 팀 맴버까지",
       "text": "어떤 프로젝트든 다섯명의 맴버까지 무료로 이용할 수 있어요!",
       "subtext": "$5명/달 로 바뀔 예정입니다."
     },
     "professional": {
+      "name": "전문가",
       "price-explanation": "/맴버/달",
       "subtext": "무제한의 프로젝트와 맴버",
       "text": "조직의 성장에 따라 유연하게 시크릿을 관리하세요."
     },
     "enterprise": {
+      "name": "엔터프라이즈",
       "text": "조직의 성장에 따라 유연하게 시크릿을 관리하세요."
     },
-    "current-usage": "현재 요금제"
+    "current-usage": "현재 요금제",
+    "free": "무료",
+    "downgrade": "다운그레이드",
+    "upgrade": "업그레이드",
+    "learn-more": "자세히 알아보기",
+    "custom-pricing": "커스텀 가격",
+    "schedule-demo": "데모 예약하기"
   },
   "section-members": {
     "add-member": "맴버 추가하기",
@@ -187,7 +177,40 @@
       "user-will-email": "유저는 안내가 포함된 메일을 받게 됩니다.",
       "looking-add": "<0>조직에 유저를 추가하고 싶다면,</0><1>여기를 클릭하세요</1>",
       "add-user-to-org": "조직에 유저 추가하기"
-    }
+    },
+    "org-members-description": "조직의 맴버들을 관리하세요."
   },
-  "integrations": {}
+  "integrations": {
+    "available": "사용 가능한 연동",
+    "available-text1": "연결하고 싶은 서비스를 클릭하세요. 환경 변수가 선택한 외부 서비스와 자동으로 연동됩니다.",
+    "available-text2": "참고: Heroku와의 연동에서는 보안상의 이유로 End-To-End 암호화를 유지하는 것이 불가능합니다. 이론적으로는 Infisical이 시크릿을 읽는것이 가능하지만, 절대 그러지 않는다고 확신할 수 있습니다. 핵심 Infisical 서비스는 항상 End-To-End 암호화 상태를 유지합니다. 질문이 있으면 support@infisical.com으로 문의하세요.",
+    "description": "외부 서비스와 함께 Infisical을 연동하고 관리하세요",
+    "no-integrations1": "연동된 서비스가 없어요. 연동하게 된다면 이곳에서 표시돼요.",
+    "no-integrations2": "시작하려면, 아래의 옵션을 클릭하세요. 대체로 5분 이내로 가능해요.",
+    "title": "프로젝트 연동"
+  },
+  "section-incident": {
+    "add-contact": "연락처 추가하기",
+    "add-dialog": {
+      "add-incident": "비상 연락처 추가하기",
+      "description": "중대한 일이 생길 경우, 이 연락처로 알림이 전송됩니다.",
+      "title": "비상 연락처 추가하기"
+    },
+    "incident-contacts": "비상 연락망",
+    "incident-contacts-description": "중대한 일이 생길 경우, 아래의 연락처로 알림이 전송됩니다.",
+    "no-incident-contacts": "비상 연락망이 존재하지 않아요."
+  },
+  "section-token": {
+    "add-dialog": {
+      "add": "서비스 토큰 추가하기",
+      "copy-service-token": "서비스 토큰 복사하기",
+      "copy-service-token-description": "팝업을 닫을 시 다시는 토큰을 확인할 수 없어요.",
+      "description": "이름, 환경, 만료일을 지정하세요. 토큰이 생성되면 최초 한번만 볼 수 있어요. 안전한 곳에 저장하세요.",
+      "name": "서비스 토큰 이름",
+      "title": "{{target}}의 토큰 추가하기"
+    },
+    "add-new": "새 토큰 추가하기",
+    "service-tokens": "서비스 토큰",
+    "service-tokens-description": "모든 서비스 토큰은 프로젝트 및 환경에 따라 다릅니다."
+  }
 }
diff --git a/frontend/pages/dashboard/[id].js b/frontend/pages/dashboard/[id].js
index 51b609063..b4cc2f728 100644
--- a/frontend/pages/dashboard/[id].js
+++ b/frontend/pages/dashboard/[id].js
@@ -454,21 +454,15 @@ export default function Dashboard() {
   return data ? (
     <div className="bg-bunker-800 max-h-screen flex flex-col justify-between text-white">
       <Head>
-        <title>{t("dashboard:meta.title")}</title>
+        <title>{t("common:head-title", { title: t("dashboard:title") })}</title>
         <link rel="icon" href="/infisical.ico" />
         <meta property="og:image" content="/images/message.png" />
-        <meta property="og:title" content={t("dashboard:meta.og-title")} />
-        <meta
-          name="og:description"
-          content={t("dashboard:meta.og-description")}
-        />
+        <meta property="og:title" content={t("dashboard:og-title")} />
+        <meta name="og:description" content={t("dashboard:og-description")} />
       </Head>
       <div className="flex flex-row">
         <div className="w-full max-h-96 pb-2">
-          <NavHeader
-            pageName={t("dashboard:secrets")}
-            isProjectRelated={true}
-          />
+          <NavHeader pageName={t("dashboard:title")} isProjectRelated={true} />
           {checkDocsPopUpVisible && (
             <BottonRightPopup
               buttonText={t("dashboard:check-docs.button")}
@@ -482,7 +476,7 @@ export default function Dashboard() {
           )}
           <div className="flex flex-row justify-between items-center mx-6 mt-6 mb-3 text-xl max-w-5xl">
             <div className="flex flex-row justify-start items-center text-3xl">
-              <p className="font-semibold mr-4 mt-1">Secrets</p>
+              <p className="font-semibold mr-4 mt-1">{t("dashboard:title")}</p>
               {data?.length == 0 && (
                 <ListBox
                   selected={env}
diff --git a/frontend/pages/settings/billing/[id].js b/frontend/pages/settings/billing/[id].js
index 2be884f97..f32d56147 100644
--- a/frontend/pages/settings/billing/[id].js
+++ b/frontend/pages/settings/billing/[id].js
@@ -18,33 +18,33 @@ export default function SettingsBilling() {
   const plans = [
     {
       key: 1,
-      name: t("common:starter"),
-      price: t("common:free"),
+      name: t("billing:starter.name"),
+      price: t("billing:free"),
       priceExplanation: t("billing:starter.price-explanation"),
       text: t("billing:starter.text"),
       subtext: t("billing:starter.subtext"),
-      buttonTextMain: t("common:downgrade"),
-      buttonTextSecondary: t("common:learn-more"),
+      buttonTextMain: t("billing:downgrade"),
+      buttonTextSecondary: t("billing:learn-more"),
       current: currentPlan == STRIPE_PRODUCT_STARTER,
     },
     {
       key: 2,
-      name: t("common:professional"),
+      name: t("billing:professional.name"),
       price: "$9",
       priceExplanation: t("billing:professional.price-explanation"),
       subtext: t("billing:professional.subtext"),
       text: t("billing:professional.text"),
-      buttonTextMain: t("common:upgrade"),
-      buttonTextSecondary: t("common:learn-more"),
+      buttonTextMain: t("billing:upgrade"),
+      buttonTextSecondary: t("billing:learn-more"),
       current: currentPlan == STRIPE_PRODUCT_PRO,
     },
     {
       key: 3,
-      name: t("common:enterprise"),
-      price: t("common:custom-pricing"),
+      name: t("billing:enterprise.name"),
+      price: t("billing:custom-pricing"),
       text: t("billing:enterprise.text"),
-      buttonTextMain: t("common:schedule-demo"),
-      buttonTextSecondary: t("common:learn-more"),
+      buttonTextMain: t("billing:schedule-demo"),
+      buttonTextSecondary: t("billing:learn-more"),
       current: false,
     },
   ];
diff --git a/frontend/pages/settings/org/[id].js b/frontend/pages/settings/org/[id].js
index b09082a73..b1fa82fd1 100644
--- a/frontend/pages/settings/org/[id].js
+++ b/frontend/pages/settings/org/[id].js
@@ -219,10 +219,10 @@ export default function SettingsOrg() {
             </div>
             <div className="bg-white/5 rounded-md px-6 pt-6 pb-2 flex flex-col items-start flex flex-col items-start w-full mb-6">
               <p className="font-semibold mr-4 text-white text-xl">
-                {t("settings:org-members")}
+                {t("section-members:org-members")}
               </p>
               <p className="mr-4 text-gray-400 mt-2 mb-2">
-                {t("settings:org-members-description")}
+                {t("section-members:org-members-description")}
               </p>
               <AddUserDialog
                 isOpen={isAddUserOpen}
@@ -245,12 +245,12 @@ export default function SettingsOrg() {
                     className="pl-2 text-gray-400 rounded-r-md bg-white/5 w-full h-full outline-none"
                     value={searchUsers}
                     onChange={(e) => setSearchUsers(e.target.value)}
-                    placeholder={t("settings:search-members")}
+                    placeholder={t("section-members:search-members")}
                   />
                 </div>
                 <div className="mt-2 ml-2 min-w-max flex flex-row items-start justify-start">
                   <Button
-                    text={t("settings:add-member")}
+                    text={t("section-members:add-member")}
                     onButtonPressed={openAddUserModal}
                     color="mineshaft"
                     size="md"
@@ -305,7 +305,7 @@ export default function SettingsOrg() {
                   className="pl-2 text-gray-400 rounded-tr-md bg-white/5 w-full h-full outline-none"
                   value={searchIncidentContact}
                   onChange={(e) => setSearchIncidentContact(e.target.value)}
-                  placeholder={t("settings:search")}
+                  placeholder={t("common:search")}
                 />
               </div>
               {incidentContacts?.filter((email) =>
diff --git a/frontend/pages/settings/personal/[id].js b/frontend/pages/settings/personal/[id].js
index 35c924803..54310cb44 100644
--- a/frontend/pages/settings/personal/[id].js
+++ b/frontend/pages/settings/personal/[id].js
@@ -243,7 +243,7 @@ export default function PersonalSettings() {
               )}
               <div className="flex flex-row items-center mt-3 w-52 pr-3">
                 <Button
-                  text="Change Password"
+                  text={t("form-password:change")}
                   onButtonPressed={() => {
                     if (
                       !passwordErrorLength &&
@@ -272,7 +272,7 @@ export default function PersonalSettings() {
                       passwordErrorNumber
                     )
                   }
-                  textDisabled={t("password:change")}
+                  textDisabled={t("form-password:change")}
                 />
                 <FontAwesomeIcon
                   icon={faCheck}
@@ -299,13 +299,13 @@ export default function PersonalSettings() {
               </div>
               <div className="w-full max-w-xl mb-4">
                 <InputField
-                  label={t("password:current")}
+                  label={t("form-password:current")}
                   onChangeHandler={setBackupPassword}
                   type="password"
                   value={backupPassword}
                   isRequired
                   error={backupKeyError}
-                  errorText={t("password:current-wrong")}
+                  errorText={t("form-password:current-wrong")}
                 />
               </div>
               <div className="flex flex-row items-center mt-3 w-full w-60">