diff --git a/package.json b/package.json
index ad90e73bb483f..05404b6115c76 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "freetube",
   "productName": "FreeTube",
   "description": "A private YouTube client",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "license": "AGPL-3.0-or-later",
   "main": "./dist/main.js",
   "private": true,
@@ -71,7 +71,7 @@
     "vue-observe-visibility": "^2.0.0-alpha.1",
     "vue-router": "^5.1.0",
     "vuex": "^4.1.0",
-    "youtubei.js": "^17.2.0"
+    "youtubei.js": "^18.0.0"
   },
   "devDependencies": {
     "@babel/core": "^8.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2dc05053efcbe..6f297dcf35c8f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,8 +75,8 @@ importers:
         specifier: ^4.1.0
         version: 4.1.0(vue@3.5.39(typescript@6.0.3))
       youtubei.js:
-        specifier: ^17.2.0
-        version: 17.2.0
+        specifier: ^18.0.0
+        version: 18.0.0
     devDependencies:
       '@babel/core':
         specifier: ^8.0.1
@@ -715,8 +715,8 @@ packages:
     resolution: {integrity: sha512-K8ponJDxBwDHigkeFqaqT5wLGl4bTlwMafR8k7b5CPxr6Ww+UG9ls8Yx6Tcpboxu97eeGVEEyKcHmEyOwN1vSw==}
     engines: {node: ^22.18.0 || >=24.11.0}
 
-  '@bufbuild/protobuf@2.1.0':
-    resolution: {integrity: sha512-+2Mx67Y3skJ4NCD/qNSdBJNWtu6x6Qr53jeNg+QcwiL6mt0wK+3jwHH2x1p7xaYH6Ve2JKOVn0OxU35WsmqI9A==}
+  '@bufbuild/protobuf@2.12.1':
+    resolution: {integrity: sha512-BvAMfS6LrgZiryOAZ4pBYucu4wG/Ei/9o9DZ9akbREnMLbPJiom2i8b9C8IsKErQoiKqVhrerzt3kOT/RrzLHg==}
 
   '@cacheable/memory@2.2.0':
     resolution: {integrity: sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==}
@@ -3585,9 +3585,9 @@ packages:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
 
-  meriyah@6.1.4:
-    resolution: {integrity: sha512-Sz8FzjzI0kN13GK/6MVEsVzMZEPvOhnmmI1lU5+/1cGOiK3QUahntrNNtdVeihrO7t9JpoH75iMNXg6R6uWflQ==}
-    engines: {node: '>=18.0.0'}
+  meriyah@7.3.1:
+    resolution: {integrity: sha512-642iQ3T0ZBXw+qrFo9m50CsdzSz9Tn0HtSKN3WxWlTXfcHUZwunxU4gMoMDIQzzOhwtkLOLeBs9GXs7NwDI2nA==}
+    engines: {node: '>=20.0.0'}
 
   micromatch@4.0.8:
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
@@ -5188,8 +5188,8 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
-  youtubei.js@17.2.0:
-    resolution: {integrity: sha512-XLNsgRKO1h7t4i9tIMWSQSeWdD7Ujkk5v1m5YCaumaHMhu/xuLqtO3M0Hq7CXNup9HlJ1NGrT1Y+HLIHnL6Ujg==}
+  youtubei.js@18.0.0:
+    resolution: {integrity: sha512-7Tztl5QzNL4nIhiAxa4P/0C8cDDsUe0j4iaUeNiaA+ZfSe/l+HkHxXyoWlQXNW7IPi2n6AW23ysVMJLDh+AwWQ==}
 
 snapshots:
 
@@ -5784,7 +5784,7 @@ snapshots:
       '@babel/helper-string-parser': 8.0.0
       '@babel/helper-validator-identifier': 8.0.2
 
-  '@bufbuild/protobuf@2.1.0': {}
+  '@bufbuild/protobuf@2.12.1': {}
 
   '@cacheable/memory@2.2.0':
     dependencies:
@@ -8353,7 +8353,7 @@ snapshots:
 
   googlevideo@4.0.4:
     dependencies:
-      '@bufbuild/protobuf': 2.1.0
+      '@bufbuild/protobuf': 2.12.1
 
   gopd@1.2.0: {}
 
@@ -8900,7 +8900,7 @@ snapshots:
 
   merge2@1.4.1: {}
 
-  meriyah@6.1.4: {}
+  meriyah@7.3.1: {}
 
   micromatch@4.0.8:
     dependencies:
@@ -10533,8 +10533,8 @@ snapshots:
 
   yocto-queue@0.1.0: {}
 
-  youtubei.js@17.2.0:
+  youtubei.js@18.0.0:
     dependencies:
-      '@bufbuild/protobuf': 2.1.0
+      '@bufbuild/protobuf': 2.12.1
       fflate: 0.8.3
-      meriyah: 6.1.4
+      meriyah: 7.3.1
diff --git a/src/main/index.js b/src/main/index.js
index 716c281fdb06a..38b708bc486b9 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -590,7 +590,10 @@ function runApp() {
         requestHeaders['Sec-Fetch-Site'] = 'same-origin'
         requestHeaders['Sec-Fetch-Mode'] = 'same-origin'
         requestHeaders['X-Youtube-Bootstrap-Logged-In'] = 'false'
-      } else if (url.startsWith('https://www.youtube.com/watch')) {
+      } else if (
+        url.startsWith('https://www.youtube.com/watch') ||
+        (urlObj.origin === 'www.youtube.com' && urlObj.pathname === '/')
+      ) {
         delete requestHeaders.Referer
         delete requestHeaders.Origin
         requestHeaders['Sec-Fetch-Dest'] = 'document'
diff --git a/src/renderer/components/CommentSection/CommentSection.css b/src/renderer/components/CommentSection/CommentSection.css
index 8dca3e6acd4f8..673add62bb423 100644
--- a/src/renderer/components/CommentSection/CommentSection.css
+++ b/src/renderer/components/CommentSection/CommentSection.css
@@ -34,14 +34,10 @@
 @media only screen and (width <= 1000px) {
   .commentSort {
     float: none;
+    margin-block: 15px;
   }
 }
 
-
-.comment {
-  padding: 15px;
-}
-
 .hideComments {
   font-size: 13px;
   text-decoration: underline;
@@ -49,151 +45,6 @@
   color: var(--title-color);
 }
 
-.commentThumbnail {
-  float: inline-start;
-  inline-size: 60px;
-  block-size: 60px;
-  border-radius: 200px;
-}
-
-.commentThumbnailHidden {
-  float: inline-start;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  inline-size: 60px;
-  block-size: 60px;
-  font-size: 20px;
-  line-height: 1em;
-  color: rgb(0 0 0);
-  background-color: rgb(235 160 172);
-  border-radius: 50%;
-}
-
-.commentAuthorWrapper {
-  font-weight: bold;
-  font-size: 14px;
-  margin-inline-start: 68px;
-  margin-block-start: 0;
-  overflow-wrap: break-word;
-}
-
-.commentOwner {
-  background-color: var(--secondary-card-bg-color);
-  border-radius: 10px;
-  padding-inline: 10px;
-}
-
-
-.commentAuthor {
-  color: inherit;
-  text-decoration: none;
-}
-
-.commentText {
-  white-space: pre-wrap;
-  font-size: 14px;
-  /* stylelint-disable-next-line liberty/use-logical-spec */
-  margin-left: -10px;
-  margin-inline-start: 70px;
-  overflow-wrap: break-word;
-}
-
-/* stylelint-disable liberty/use-logical-spec */
-:global(body[dir='rtl'] .commentText) {
-  margin-left: initial;
-  margin-right: -10px;
-}
-/* stylelint-enable liberty/use-logical-spec */
-
-.commentPinned {
-  font-weight: normal;
-  font-size: 12px;
-  margin-block: 0 5px;
-  margin-inline-start: 68px;
-}
-
-.commentDate {
-  font-weight: normal;
-  margin-inline-start: 5px;
-  font-size: 12px;
-}
-
-.commentMemberIcon {
-  margin-inline-start: 5px;
-  inline-size: 14px;
-  block-size: 14px;
-}
-
-.commentSubscribedIcon {
-  content: var(--logo-icon);
-  block-size: 14px;
-  inline-size: 14px;
-  vertical-align: middle;
-  margin-inline: 0.25em;
-}
-
-.commentLikeCount {
-  font-size: 11px;
-  margin-inline-start: 70px;
-  margin-block-start: 0;
-}
-
-.commentHeartBadge {
-  display: inline-block;
-  position: relative;
-  inline-size: 25px;
-  block-size: 20px;
-  margin-inline-start: 10px;
-  margin-block-end: -7px;
-}
-
-.commentHeartBadgeImg {
-  position: absolute;
-  inset-inline-start: 0;
-  inline-size: 15px;
-  block-size: 15px;
-  border-radius: 50%;
-}
-
-.commentHeartBadgeWhite {
-  position: absolute;
-  inset-inline-start: 9px;
-  inset-block-end: 1px;
-  inline-size: 11px;
-  block-size: 11px;
-  z-index: 1;
-}
-
-.commentHeartBadgeRed {
-  position: absolute;
-  color: var(--red-500);
-  inset-inline-start: 10px;
-  inset-block-end: 2px;
-  inline-size: 9px;
-  block-size: 9px;
-  z-index: 2;
-}
-
-.commentMoreReplies {
-  font-size: 11px;
-  margin-inline-start: 5px;
-  text-decoration: underline;
-  cursor: pointer;
-  color: var(--title-color);
-}
-
-.commentReplies {
-  margin-inline-start: 30px;
-}
-
-.showMoreReplies {
-  margin-inline-start: 30px;
-  font-size: 15px;
-  cursor: pointer;
-  text-decoration: underline;
-}
-
 .getMoreComments {
   padding-block-end: 1em;
   text-align: center;
diff --git a/src/renderer/components/CommentSection/CommentSection.vue b/src/renderer/components/CommentSection/CommentSection.vue
index 51a3bf1d83db2..55444796c6b16 100644
--- a/src/renderer/components/CommentSection/CommentSection.vue
+++ b/src/renderer/components/CommentSection/CommentSection.vue
@@ -53,237 +53,18 @@
     <div
       v-if="commentData.length > 0 && showComments"
     >
-      <div
+      <FtComment
         v-for="(comment, index) in commentData"
         :id="'comment' + index"
         :key="comment.id"
-        class="comment"
-      >
-        <component
-          :is="enableChannelLinks ? 'router-link' : 'div'"
-          :to="`/channel/${comment.authorLink}`"
-          tabindex="-1"
-        >
-          <!-- Hide comment photo only if it isn't the video uploader -->
-          <div
-            v-if="hideCommentPhotos && !comment.isOwner"
-            class="commentThumbnailHidden"
-            dir="auto"
-          >
-            {{ comment.author.substring(1, 2) }}
-          </div>
-          <img
-            v-else
-            :src="comment.authorThumb"
-            alt=""
-            class="commentThumbnail"
-          >
-        </component>
-        <p
-          v-if="comment.isPinned"
-          class="commentPinned"
-        >
-          <FontAwesomeIcon
-            :icon="['fas', 'thumbtack']"
-          />
-          {{ $t("Comments.Pinned by") }} <bdi>{{ channelName }}</bdi>
-        </p>
-        <p
-          class="commentAuthorWrapper"
-        >
-          <component
-            :is="enableChannelLinks ? 'router-link' : 'span'"
-            class="commentAuthor"
-            dir="auto"
-            :class="{
-              commentOwner: comment.isOwner
-            }"
-            :to="`/channel/${comment.authorLink}`"
-          >
-            {{ comment.author }}
-          </component>
-          <img
-            v-if="comment.isMember"
-            :src="comment.memberIconUrl"
-            :title="$t('Comments.Member')"
-            :aria-label="$t('Comments.Member')"
-            class="commentMemberIcon"
-            alt=""
-          >
-          <img
-            v-if="isSubscribedToChannel(comment.authorId)"
-            :title="$t('Comments.Subscribed')"
-            :aria-label="$t('Comments.Subscribed')"
-            class="commentSubscribedIcon"
-            alt=""
-          >
-          <span class="commentDate">
-            {{ comment.time }}
-          </span>
-        </p>
-        <FtTimestampCatcher
-          class="commentText"
-          :input-html="comment.text"
-          @timestamp-event="onTimestamp"
-        />
-        <p class="commentLikeCount">
-          <template
-            v-if="!hideCommentLikes"
-          >
-            <FontAwesomeIcon
-              :icon="['fas', 'thumbs-up']"
-            />
-            {{ comment.likes }}
-          </template>
-          <span
-            v-if="comment.isHearted"
-            class="commentHeartBadge"
-          >
-            <img
-              :src="channelThumbnail"
-              :title="$t('Comments.Hearted')"
-              :aria-label="$t('Comments.Hearted')"
-              class="commentHeartBadgeImg"
-              alt=""
-            >
-            <FontAwesomeIcon
-              :icon="['fas', 'heart']"
-              class="commentHeartBadgeWhite"
-            />
-            <FontAwesomeIcon
-              :icon="['fas', 'heart']"
-              class="commentHeartBadgeRed"
-            />
-          </span>
-          <span
-            v-if="comment.numReplies > 0"
-            class="commentMoreReplies"
-            role="button"
-            tabindex="0"
-            @click="toggleCommentReplies(index)"
-            @keydown.space.prevent="toggleCommentReplies(index)"
-            @keydown.enter.prevent="toggleCommentReplies(index)"
-          >
-            <span>
-              {{ toggleCommentRepliesLinkText(comment) }}
-            </span>
-          </span>
-        </p>
-        <div
-          v-if="comment.showReplies"
-          class="commentReplies"
-        >
-          <div
-            v-for="(reply, replyIndex) in comment.replies"
-            :id="'comment' + index + '-' + replyIndex"
-            :key="replyIndex"
-            class="comment"
-          >
-            <component
-              :is="enableChannelLinks ? 'router-link' : 'div'"
-              :to="`/channel/${reply.authorLink}`"
-              tabindex="-1"
-            >
-              <!-- Hide comment photo only if it isn't the video uploader -->
-              <div
-                v-if="hideCommentPhotos && !reply.isOwner"
-                class="commentThumbnailHidden"
-                dir="auto"
-              >
-                {{ reply.author.substring(1, 2) }}
-              </div>
-              <img
-                v-else
-                :src="reply.authorThumb"
-                alt=""
-                class="commentThumbnail"
-              >
-            </component>
-            <p class="commentAuthorWrapper">
-              <component
-                :is="enableChannelLinks ? 'router-link' : 'span'"
-                class="commentAuthor"
-                dir="auto"
-                :class="{
-                  commentOwner: reply.isOwner
-                }"
-                :to="`/channel/${reply.authorLink}`"
-              >
-                {{ reply.author }}
-              </component>
-              <img
-                v-if="reply.isMember"
-                :src="reply.memberIconUrl"
-                class="commentMemberIcon"
-                alt=""
-              >
-              <img
-                v-if="isSubscribedToChannel(reply.authorId)"
-                :title="$t('Comments.Subscribed')"
-                :aria-label="$t('Comments.Subscribed')"
-                class="commentSubscribedIcon"
-                alt=""
-              >
-              <span class="commentDate">
-                {{ reply.time }}
-              </span>
-            </p>
-            <FtTimestampCatcher
-              class="commentText"
-              :input-html="reply.text"
-              @timestamp-event="onTimestamp"
-            />
-            <p class="commentLikeCount">
-              <template
-                v-if="!hideCommentLikes"
-              >
-                <FontAwesomeIcon
-                  v-if="!hideCommentLikes"
-                  :icon="['fas', 'thumbs-up']"
-                />
-                {{ reply.likes }}
-              </template>
-              <span
-                v-if="reply.isHearted"
-                class="commentHeartBadge"
-              >
-                <img
-                  :src="channelThumbnail"
-                  :title="$t('Comments.Hearted')"
-                  :aria-label="$t('Comments.Hearted')"
-                  class="commentHeartBadgeImg"
-                  alt=""
-                >
-                <FontAwesomeIcon
-                  :icon="['fas', 'heart']"
-                  class="commentHeartBadgeWhite"
-                />
-                <FontAwesomeIcon
-                  :icon="['fas', 'heart']"
-                  class="commentHeartBadgeRed"
-                />
-              </span>
-            </p>
-            <p
-              v-if="reply.numReplies > 0"
-              class="commentMoreReplies"
-            >
-              {{ $t('Comments.View {replyCount} replies', { replyCount: reply.numReplies }, reply.numReplies) }}
-            </p>
-          </div>
-          <div
-            v-if="comment.hasReplyToken"
-            class="showMoreReplies"
-            role="button"
-            tabindex="0"
-            @click="getCommentReplies(index)"
-            @keydown.space.prevent="getCommentReplies(index)"
-            @keydown.enter.prevent="getCommentReplies(index)"
-          >
-            <span>{{ $t("Comments.Show More Replies") }}</span>
-          </div>
-        </div>
-      </div>
+        :comment="comment"
+        :channel-name="channelName"
+        :channel-thumbnail="channelThumbnail"
+        :autoload-this-reply-level="false"
+        :can-fallback-to-invidious="canFallbackToInvidious"
+        :get-invidious-comment-replies="getInvidiousCommentReplies"
+        @timestamp-event="onTimestamp"
+      />
     </div>
     <div
       v-else-if="showComments && !isLoading"
@@ -326,14 +107,13 @@
 </template>
 
 <script setup>
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
 import { computed, ref, shallowRef } from 'vue'
 import { useI18n } from 'vue-i18n'
 
 import FtCard from '../ft-card/ft-card.vue'
+import FtComment from '../FtComment/FtComment.vue'
 import FtLoader from '../FtLoader/FtLoader.vue'
 import FtSelect from '../FtSelect/FtSelect.vue'
-import FtTimestampCatcher from '../FtTimestampCatcher.vue'
 
 import store from '../../store/index'
 
@@ -379,13 +159,21 @@ const props = defineProps({
   }
 })
 
+const emit = defineEmits(['timestamp-event'])
+/**
+ * @param {number} timestamp
+ */
+function onTimestamp(timestamp) {
+  emit('timestamp-event', timestamp)
+}
+
 const isLoading = ref(false)
+const isMoreCommentsLoading = ref(false)
 const showComments = ref(false)
 const nextPageToken = shallowRef(null)
 
-// Has to be ref not shallowRef, as the replies are stored in a property on the comments
-// we need to react to new replies and showReplies being toggled
-const commentData = ref([])
+/** @type {import('vue').ShallowRef<import('../FtComment/FtComment.vue').Comment[]>} */
+const commentData = shallowRef([])
 
 /** @type {import('youtubei.js').YT.Comments | undefined} */
 let localCommentsInstance
@@ -401,13 +189,8 @@ const backendFallback = computed(() => {
 })
 
 /** @type {import('vue').ComputedRef<boolean>} */
-const hideCommentLikes = computed(() => {
-  return store.getters.getHideCommentLikes
-})
-
-/** @type {import('vue').ComputedRef<boolean>} */
-const hideCommentPhotos = computed(() => {
-  return store.getters.getHideCommentPhotos
+const canFallbackToInvidious = computed(() => {
+  return backendFallback.value && backendPreference.value === 'local'
 })
 
 /** @type {import('vue').ComputedRef<boolean>} */
@@ -420,7 +203,7 @@ const canPerformInitialCommentLoading = computed(() => {
 })
 
 const canPerformMoreCommentLoading = computed(() => {
-  return commentData.value.length > 0 && !isLoading.value && showComments.value && !!nextPageToken.value
+  return commentData.value.length > 0 && !isLoading.value && showComments.value && !!nextPageToken.value && !isMoreCommentsLoading.value
 })
 
 const observeVisibilityOptions = computed(() => {
@@ -474,31 +257,6 @@ function handleSortChange() {
   getCommentData()
 }
 
-const emit = defineEmits(['timestamp-event'])
-
-const enableChannelLinks = computed(() => !store.getters.getDisableChannelLinks)
-
-/**
- * @param {number} timestamp
- */
-function onTimestamp(timestamp) {
-  emit('timestamp-event', timestamp)
-}
-
-/** @type {import('vue').ComputedRef<Set<string>>} */
-const subscribedChannelIds = computed(() => {
-  return store.getters.getActiveProfile.subscriptions.reduce((set, channel) => {
-    return set.add(channel.id)
-  }, new Set())
-})
-
-/**
- * @param {string} channelId
- */
-function isSubscribedToChannel(channelId) {
-  return subscribedChannelIds.value.has(channelId)
-}
-
 function getCommentData() {
   isLoading.value = true
 
@@ -513,71 +271,28 @@ function getCommentData() {
   }
 }
 
-function getMoreComments() {
+async function getMoreComments() {
   if (commentData.value.length === 0 || nextPageToken.value == null) {
     showToast(t('Comments.There are no more comments for this video'))
   } else {
+    if (isMoreCommentsLoading.value) return
+
+    isMoreCommentsLoading.value = true
+
     if (!process.env.SUPPORTS_LOCAL_API || backendPreference.value === 'invidious') {
       if (!props.isPostComments) {
-        getCommentDataInvidious()
+        await getCommentDataInvidious()
       } else {
-        getPostCommentsInvidious()
+        await getPostCommentsInvidious()
       }
     } else {
-      getCommentDataLocal(true)
-    }
-  }
-}
-
-/** @typedef {import('../../helpers/api/local').LocalComment | import('../../helpers/api/invidious').InvidiousComment} Comment */
-/**
- * @param {Comment} comment
- */
-function toggleCommentRepliesLinkText(comment) {
-  if (comment.showReplies) {
-    return t('Comments.Hide {replyCount} replies', { replyCount: comment.numReplies }, comment.numReplies)
-  }
-
-  if (comment.hasOwnerReplied) {
-    if (comment.numReplies > 1) {
-      return t('Comments.View {replyCount} replies from {channelName} and others', { replyCount: comment.numReplies, channelName: props.channelName })
+      await getCommentDataLocal(true)
     }
 
-    return t('Comments.View 1 reply from {channelName}', { channelName: props.channelName })
-  }
-
-  return t('Comments.View {replyCount} replies', { replyCount: comment.numReplies }, comment.numReplies)
-}
-
-/**
- * @param {number} index
- */
-function toggleCommentReplies(index) {
-  if (commentData.value[index].showReplies || commentData.value[index].replies.length > 0) {
-    commentData.value[index].showReplies = !commentData.value[index].showReplies
-  } else {
-    getCommentReplies(index)
-  }
-}
-
-/**
- * @param {number} index
- */
-function getCommentReplies(index) {
-  if (!process.env.SUPPORTS_LOCAL_API || commentData.value[index].dataType === 'invidious') {
-    if (!props.isPostComments) {
-      getCommentRepliesInvidious(index)
-    } else {
-      getPostCommentRepliesInvidious(index)
-    }
-  } else {
-    getCommentRepliesLocal(index)
+    isMoreCommentsLoading.value = false
   }
 }
 
-/** @type {Map<string, (import('youtubei.js').YTNodes.CommentThread | string)>} */
-const replyTokens = new Map()
-
 /**
  * @param {boolean | undefined} more
  */
@@ -603,18 +318,7 @@ async function getCommentDataLocal(more = false) {
     }
 
     const parsedComments = comments.contents
-      .map(commentThread => {
-        // Use destructuring to create a new object without the replyToken
-        const { replyToken, ...comment } = parseLocalComment(commentThread.comment, commentThread)
-
-        if (comment.hasReplyToken) {
-          replyTokens.set(comment.id, replyToken)
-        } else {
-          replyTokens.delete(comment.id)
-        }
-
-        return comment
-      })
+      .map(commentThread => parseLocalComment(commentThread.comment, commentThread))
 
     if (more) {
       commentData.value = commentData.value.concat(parsedComments)
@@ -628,7 +332,7 @@ async function getCommentDataLocal(more = false) {
   } catch (err) {
     // region No comment detection
     // No comment related info when video info requested earlier in parent component
-    if (err.message.includes('Comments page did not have any content')) {
+    if (err.message.includes('The comments page did not have any content')) {
       // For videos without any comment (comment disabled?)
       // e.g. https://youtu.be/8NBSwDEf8a8
       commentData.value = []
@@ -649,9 +353,9 @@ async function getCommentDataLocal(more = false) {
       localCommentsInstance = undefined
       showToast(t('Falling back to Invidious API'))
       if (props.isPostComments) {
-        getPostCommentsInvidious()
+        await getPostCommentsInvidious()
       } else {
-        getCommentDataInvidious()
+        await getCommentDataInvidious()
       }
     } else {
       isLoading.value = false
@@ -659,73 +363,14 @@ async function getCommentDataLocal(more = false) {
   }
 }
 
-/**
- * @param {number} index
- */
-async function getCommentRepliesLocal(index) {
-  showToast(t('Comments.Getting comment replies, please wait'))
-
-  try {
-    const comment = commentData.value[index]
-    /** @type {import('youtubei.js').YTNodes.CommentThread} */
-    const commentThread = replyTokens.get(comment.id)
-
-    if (commentThread == null) {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-      return
-    }
-
-    if (comment.replies.length > 0) {
-      await commentThread.getContinuation()
-      comment.replies = comment.replies.concat(commentThread.replies.map(reply => parseLocalComment(reply)))
-    } else {
-      await commentThread.getReplies()
-      comment.replies = commentThread.replies.map(reply => parseLocalComment(reply))
-    }
-
-    if (commentThread.has_continuation) {
-      replyTokens.set(comment.id, commentThread)
-      comment.hasReplyToken = true
-    } else {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-    }
-
-    comment.showReplies = true
-  } catch (err) {
-    console.error(err)
-    const errorMessage = t('Local API Error (Click to copy)')
-    showToast(`${errorMessage}: ${err}`, 10000, () => {
-      copyToClipboard(err)
-    })
-    if (backendFallback.value && backendPreference.value === 'local') {
-      showToast(t('Falling back to Invidious API'))
-      getCommentDataInvidious()
-    } else {
-      isLoading.value = false
-    }
-  }
-}
-
 async function getCommentDataInvidious() {
   try {
-    let { response, commentData: comments } = await invidiousGetComments({
+    const { response, commentData: comments } = await invidiousGetComments({
       id: props.id,
       nextPageToken: nextPageToken.value,
       sortNewest: sortNewest.value
     })
 
-    comments = comments.map(({ replyToken, ...comment }) => {
-      if (comment.hasReplyToken) {
-        replyTokens.set(comment.id, replyToken)
-      } else {
-        replyTokens.delete(comment.id)
-      }
-
-      return comment
-    })
-
     commentData.value = commentData.value.concat(comments)
     nextPageToken.value = response.continuation
     isLoading.value = false
@@ -752,68 +397,26 @@ async function getCommentDataInvidious() {
 
     if (process.env.SUPPORTS_LOCAL_API && backendFallback.value && backendPreference.value === 'invidious') {
       showToast(t('Falling back to Local API'))
-      getCommentDataLocal()
+      await getCommentDataLocal()
     } else {
       isLoading.value = false
     }
   }
 }
 
-/**
- * @param {number} index
- */
-async function getCommentRepliesInvidious(index) {
-  showToast(t('Comments.Getting comment replies, please wait'))
-
-  const comment = commentData.value[index]
-  const replyToken = replyTokens.get(comment.id)
-
+async function getPostCommentsInvidious() {
   try {
-    const { commentData, continuation } = await invidiousGetCommentReplies({ id: props.id, replyToken })
+    const fetchComments = nextPageToken.value == null
+      ? getInvidiousCommunityPostComments({ postId: props.id, authorId: props.postAuthorId })
+      : getInvidiousCommunityPostCommentReplies({ postId: props.id, replyToken: nextPageToken.value, authorId: props.postAuthorId })
 
-    comment.replies = comment.replies.concat(commentData)
-    comment.showReplies = true
-
-    if (continuation) {
-      replyTokens.set(comment.id, continuation)
-      comment.hasReplyToken = true
-    } else {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-    }
-
-    isLoading.value = false
-  } catch (error) {
-    console.error(error)
-    const errorMessage = t('Invidious API Error (Click to copy)')
-    showToast(`${errorMessage}: ${error}`, 10000, () => {
-      copyToClipboard(error)
-    })
-    isLoading.value = false
-  }
-}
-
-function getPostCommentsInvidious() {
-  const fetchComments = nextPageToken.value == null
-    ? getInvidiousCommunityPostComments({ postId: props.id, authorId: props.postAuthorId })
-    : getInvidiousCommunityPostCommentReplies({ postId: props.id, replyToken: nextPageToken.value, authorId: props.postAuthorId })
-
-  fetchComments.then(({ response, commentData: comments, continuation }) => {
-    comments = comments.map(({ replyToken, ...comment }) => {
-      if (comment.hasReplyToken) {
-        replyTokens.set(comment.id, replyToken)
-      } else {
-        replyTokens.delete(comment.id)
-      }
-
-      return comment
-    })
+    const { response, commentData: comments, continuation } = await fetchComments
 
     commentData.value = commentData.value.concat(comments)
     nextPageToken.value = response?.continuation ?? continuation
     isLoading.value = false
     showComments.value = true
-  }).catch((err) => {
+  } catch (err) {
     console.error(err)
     const errorMessage = t('Invidious API Error (Click to copy)')
     showToast(`${errorMessage}: ${err}`, 10000, () => {
@@ -822,43 +425,30 @@ function getPostCommentsInvidious() {
 
     if (process.env.SUPPORTS_LOCAL_API && backendFallback.value && backendPreference.value === 'invidious') {
       showToast(t('Falling back to Local API'))
-      getCommentDataLocal()
+      await getCommentDataLocal()
     } else {
       isLoading.value = false
     }
-  })
+  }
 }
 
-async function getPostCommentRepliesInvidious(index) {
-  showToast(t('Comments.Getting comment replies, please wait'))
-
-  const comment = commentData.value[index]
-  const replyToken = replyTokens.get(comment.id)
-
+/**
+ * Pure function for use inside FtComment
+ * @param {string} replyToken
+ */
+async function getInvidiousCommentReplies(replyToken) {
   try {
-    const { commentData: comments, continuation } = await getInvidiousCommunityPostCommentReplies({
-      postId: props.id,
-      replyToken: replyToken,
-      authorId: props.postAuthorId
-    })
-    comment.replies = comment.replies.concat(comments)
-    comment.showReplies = true
-
-    if (continuation) {
-      replyTokens.set(comment.id, continuation)
-      comment.hasReplyToken = true
-    } else {
-      replyTokens.delete(comment.id)
-      comment.hasReplyToken = false
-    }
-
-    isLoading.value = false
+    return !props.isPostComments
+      ? await invidiousGetCommentReplies({ id: props.id, replyToken })
+      : await getInvidiousCommunityPostCommentReplies({ postId: props.id, replyToken, authorId: props.postAuthorId })
   } catch (error) {
     console.error(error)
     const errorMessage = t('Invidious API Error (Click to copy)')
     showToast(`${errorMessage}: ${error}`, 10000, () => {
       copyToClipboard(error)
     })
+    return null
+  } finally {
     isLoading.value = false
   }
 }
diff --git a/src/renderer/components/FtComment/FtComment.css b/src/renderer/components/FtComment/FtComment.css
new file mode 100644
index 0000000000000..dc0cda6b156bc
--- /dev/null
+++ b/src/renderer/components/FtComment/FtComment.css
@@ -0,0 +1,244 @@
+.comment {
+  --comment-thumb-size: 60px;
+  --comment-thumb-font-size: calc(var(--comment-thumb-size) * 0.4);
+  --comment-padding-block: 15px;
+  --comment-padding-inline: 15px;
+  --thread-line-padding-block: calc(var(--comment-thumb-size) / 2 + var(--comment-padding-block));
+  --thread-line-padding-inline: calc(var(--comment-thumb-size) / 2 + var(--comment-padding-inline));
+
+  padding-block: var(--comment-padding-block);
+  padding-inline: var(--comment-padding-inline);
+  position: relative;
+  z-index: 0;
+}
+
+.commentReplies {
+  margin-inline-start: calc(var(--comment-thumb-size) / 2);
+  padding-block-start: var(--comment-padding-block);
+}
+
+.commentReplies .comment {
+  --comment-thumb-size: 50px;
+
+  padding-inline-end: 0;
+}
+
+.commentReplies .comment:last-child {
+  padding-block-end: 0;
+}
+
+@media only screen and (width <= 680px) {
+  .comment {
+    --comment-thumb-size: 30px;
+    --comment-thumb-font-size: calc(var(--comment-thumb-size) * 0.6);
+    --comment-padding-block: 10px;
+    --comment-padding-inline: 10px;
+
+    margin-inline: -10px;
+  }
+
+  .commentReplies .comment {
+    --comment-thumb-size: 20px;
+
+    margin-inline: 0;
+  }
+}
+
+.comment::before {
+  content: '';
+  border-inline-end: 2px solid var(--scrollbar-color);
+  inline-size: var(--thread-line-padding-inline);
+  /* stylelint-disable-next-line declaration-block-no-redundant-longhand-properties */
+  inset-block-start: calc(var(--thread-line-padding-block) - 1px);
+  inset-block-end: calc(var(--comment-padding-block) + 11px);
+  inset-inline-start: -1px;
+  position: absolute;
+  z-index: -1;
+}
+
+.comment:not(:has(>.commentReplies))::before {
+  block-size: 0;
+}
+
+.commentReplies > .comment::before {
+  border-block-start: 2px solid var(--scrollbar-color);
+}
+
+.commentReplies > .comment:last-child::before {
+  inset-block-end: 11px; /* padding-block-end: 0 */
+}
+
+.commentReplies > *:last-child::after {
+  content: '';
+  border-inline-start: 2px solid var(--card-bg-color);
+  inline-size: var(--thread-line-padding-inline);
+  inset-block: 0;
+  inset-block-start: calc(var(--thread-line-padding-block) + 1px);
+  inset-inline-start: -1px;
+  position: absolute;
+}
+
+.commentThumbnail {
+  float: inline-start;
+  block-size: var(--comment-thumb-size);
+  inline-size: var(--comment-thumb-size);
+  border-radius: 200px;
+}
+
+.commentThumbnailHidden {
+  float: inline-start;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  block-size: var(--comment-thumb-size);
+  inline-size: var(--comment-thumb-size);
+  font-size: var(--comment-thumb-font-size);
+  line-height: 1em;
+  color: rgb(0 0 0);
+  background-color: rgb(235 160 172);
+  border-radius: 50%;
+}
+
+.commentAuthorWrapper {
+  font-weight: bold;
+  font-size: 14px;
+  margin-inline-start: calc(var(--comment-thumb-size) + 8px);
+  margin-block-start: 0;
+  overflow-wrap: break-word;
+}
+
+.commentOwner {
+  background-color: var(--secondary-card-bg-color);
+  border-radius: 10px;
+  padding-inline: 10px;
+}
+
+.commentAuthor {
+  color: inherit;
+  text-decoration: none;
+}
+
+.commentText {
+  white-space: pre-wrap;
+  font-size: 14px;
+  /* stylelint-disable-next-line liberty/use-logical-spec */
+  margin-left: -10px;
+  margin-inline-start: calc(var(--comment-thumb-size) + 10px);
+  overflow-wrap: break-word;
+}
+
+/* stylelint-disable liberty/use-logical-spec */
+:global(body[dir='rtl'] .commentText) {
+  margin-left: initial;
+  margin-right: -10px;
+}
+/* stylelint-enable liberty/use-logical-spec */
+
+.commentPinned {
+  font-weight: normal;
+  font-size: 12px;
+  margin-block: 0 5px;
+  margin-inline-start: calc(var(--comment-thumb-size) + 8px);
+}
+
+.commentDate {
+  font-weight: normal;
+  margin-inline-start: 5px;
+  font-size: 12px;
+}
+
+.commentMemberIcon {
+  margin-inline-start: 5px;
+  inline-size: 14px;
+  block-size: 14px;
+}
+
+.commentSubscribedIcon {
+  content: var(--logo-icon);
+  block-size: 14px;
+  inline-size: 14px;
+  vertical-align: middle;
+  margin-inline: 0.25em;
+}
+
+.commentLikeCount {
+  font-size: 11px;
+  margin-inline-start: calc(var(--comment-thumb-size) + 10px);
+  margin-block-start: 0;
+}
+
+.commentHeartBadge {
+  display: inline-block;
+  position: relative;
+  inline-size: 25px;
+  block-size: 20px;
+  margin-inline-start: 10px;
+  margin-block-end: -7px;
+}
+
+.commentHeartBadgeImg {
+  position: absolute;
+  inset-inline-start: 0;
+  inline-size: 15px;
+  block-size: 15px;
+  border-radius: 50%;
+}
+
+.commentHeartBadgeWhite {
+  position: absolute;
+  inset-inline-start: 9px;
+  inset-block-end: 1px;
+  inline-size: 11px;
+  block-size: 11px;
+  z-index: 1;
+}
+
+.commentHeartBadgeRed {
+  position: absolute;
+  color: var(--red-500);
+  inset-inline-start: 10px;
+  inset-block-end: 2px;
+  inline-size: 9px;
+  block-size: 9px;
+  z-index: 2;
+}
+
+.commentMoreReplies {
+  font-size: 11px;
+  margin-inline-start: 5px;
+  text-decoration: underline;
+  cursor: pointer;
+  color: var(--title-color);
+}
+
+.commentLoadingMoreReplies {
+  font-size: 11px;
+  margin-inline-start: 5px;
+  color: var(--title-color);
+}
+
+.showMoreReplies {
+  padding-inline-start: calc(var(--thread-line-padding-inline) / 2);
+  position: relative;
+  font-size: 15px;
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+.loadingMoreReplies {
+  padding-inline-start: calc(var(--thread-line-padding-inline) / 2);
+  position: relative;
+  font-size: 15px;
+}
+
+.showMoreReplies::before,
+.loadingMoreReplies::before {
+  content: '';
+  border-block-end: 2px solid var(--scrollbar-color);
+  border-inline-start: 2px solid var(--scrollbar-color);
+  block-size: 2.5px;
+  inline-size: calc(var(--thread-line-padding-inline) / 2 - 5px);
+  inset-block-start: 6.5px;
+  inset-inline-start: -1px;
+  position: absolute;
+}
diff --git a/src/renderer/components/FtComment/FtComment.vue b/src/renderer/components/FtComment/FtComment.vue
new file mode 100644
index 0000000000000..a7647f6ca0aab
--- /dev/null
+++ b/src/renderer/components/FtComment/FtComment.vue
@@ -0,0 +1,377 @@
+<template>
+  <div
+    :id="id"
+    class="comment"
+  >
+    <component
+      :is="enableChannelLinks ? 'router-link' : 'div'"
+      :to="`/channel/${comment.authorId}`"
+      tabindex="-1"
+    >
+      <!-- Hide comment photo only if it isn't the video uploader -->
+      <div
+        v-if="hideCommentPhotos && !comment.isOwner"
+        class="commentThumbnailHidden"
+        dir="auto"
+      >
+        {{ comment.author.substring(1, 2) }}
+      </div>
+      <img
+        v-else
+        :src="comment.authorThumb"
+        alt=""
+        class="commentThumbnail"
+      >
+    </component>
+    <p
+      v-if="comment.isPinned"
+      class="commentPinned"
+    >
+      <FontAwesomeIcon
+        :icon="['fas', 'thumbtack']"
+      />
+      {{ $t("Comments.Pinned by") }} <bdi>{{ channelName }}</bdi>
+    </p>
+    <p
+      class="commentAuthorWrapper"
+    >
+      <component
+        :is="enableChannelLinks ? 'router-link' : 'span'"
+        class="commentAuthor"
+        dir="auto"
+        :class="{
+          commentOwner: comment.isOwner
+        }"
+        :to="`/channel/${comment.authorId}`"
+      >
+        {{ comment.author }}
+      </component>
+      <img
+        v-if="comment.isMember"
+        :src="comment.memberIconUrl"
+        :title="$t('Comments.Member')"
+        :aria-label="$t('Comments.Member')"
+        class="commentMemberIcon"
+        alt=""
+      >
+      <img
+        v-if="isSubscribedToChannel(comment.authorId)"
+        :title="$t('Comments.Subscribed')"
+        :aria-label="$t('Comments.Subscribed')"
+        class="commentSubscribedIcon"
+        alt=""
+      >
+      <span class="commentDate">
+        {{ comment.time }}
+      </span>
+    </p>
+    <FtTimestampCatcher
+      class="commentText"
+      :input-html="comment.text"
+      @timestamp-event="onTimestamp"
+    />
+    <p class="commentLikeCount">
+      <template
+        v-if="!hideCommentLikes"
+      >
+        <FontAwesomeIcon
+          :icon="['fas', 'thumbs-up']"
+        />
+        {{ comment.likes || '' }}
+      </template>
+      <span
+        v-if="comment.isHearted"
+        class="commentHeartBadge"
+      >
+        <img
+          :src="channelThumbnail"
+          :title="$t('Comments.Hearted')"
+          :aria-label="$t('Comments.Hearted')"
+          class="commentHeartBadgeImg"
+          alt=""
+        >
+        <FontAwesomeIcon
+          :icon="['fas', 'heart']"
+          class="commentHeartBadgeWhite"
+        />
+        <FontAwesomeIcon
+          :icon="['fas', 'heart']"
+          class="commentHeartBadgeRed"
+        />
+      </span>
+      <span
+        v-if="showReplies || comment.numReplies > 0 && !repliesLoading"
+        class="commentMoreReplies"
+        role="button"
+        tabindex="0"
+        @click="toggleCommentReplies"
+        @keydown.enter.space.prevent="toggleCommentReplies"
+      >
+        <span>
+          {{ toggleCommentRepliesText }}
+        </span>
+      </span>
+      <span
+        v-else-if="comment.numReplies > 0 && repliesLoading"
+        class="commentLoadingMoreReplies"
+        tabindex="0"
+      >
+        <span>
+          {{ $t("Comments.Loading replies") }}
+        </span>
+      </span>
+    </p>
+    <div
+      v-if="showReplies"
+      class="commentReplies"
+    >
+      <FtComment
+        v-for="(reply, replyIndex) in replies"
+        :id="id + '-' + replyIndex"
+        :key="replyIndex"
+        :comment="reply"
+        :channel-name="channelName"
+        :channel-thumbnail="channelThumbnail"
+        :autoload-this-reply-level="!!reply.replyLevel && !autoloadThisReplyLevel"
+        :can-fallback-to-invidious="canFallbackToInvidious"
+        :get-invidious-comment-replies="getInvidiousCommentReplies"
+        @timestamp-event="onTimestamp"
+      />
+      <div
+        v-if="replyToken && !repliesLoading"
+        class="showMoreReplies"
+        role="button"
+        tabindex="0"
+        @click="getCommentReplies"
+        @keydown.enter.space.prevent="getCommentReplies"
+      >
+        <span>{{ t('Comments.Show More Replies') }}{{ numRepliesRemainingText }}</span>
+      </div>
+      <div
+        v-else-if="replyToken && repliesLoading"
+        class="loadingMoreReplies"
+        tabindex="0"
+      >
+        <span>{{ $t("Comments.Loading replies") }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
+import { computed, onMounted, ref, shallowRef } from 'vue'
+import { useI18n } from 'vue-i18n'
+
+import FtTimestampCatcher from '../FtTimestampCatcher.vue'
+
+import store from '../../store/index'
+
+import { copyToClipboard, showToast } from '../../helpers/utils'
+import { parseLocalComment } from '../../helpers/api/local'
+
+const { t } = useI18n()
+
+/**
+ * @import { ComputedRef, PropType, ShallowRef } from 'vue'
+ *
+ * @import { InvidiousComment } from '../../helpers/api/invidious')
+ * @import { LocalComment } from '../../helpers/api/local'
+ *
+ * @typedef {InvidiousComment | LocalComment} Comment
+ * @exports Comment
+ */
+const props = defineProps({
+  id: {
+    type: String,
+    required: true
+  },
+  comment: {
+    /** @type {PropType<Comment>} */
+    type: Object,
+    required: true
+  },
+  channelName: {
+    type: String,
+    required: true
+  },
+  channelThumbnail: {
+    type: String,
+    required: true
+  },
+  autoloadThisReplyLevel: {
+    type: Boolean,
+    default: false
+  },
+  getInvidiousCommentReplies: {
+    /** @type {PropType<(replyToken: string) => Promise<{commentData: InvidiousComment[], continuation?: string} | null>>} */
+    type: Function,
+    required: true
+  },
+  canFallbackToInvidious: {
+    type: Boolean,
+    required: true
+  }
+})
+
+const emit = defineEmits(['timestamp-event'])
+/**
+ * @param {number} timestamp
+ */
+function onTimestamp(timestamp) {
+  emit('timestamp-event', timestamp)
+}
+
+const showReplies = ref(false)
+const repliesLoading = ref(false)
+const replyToken = shallowRef(props.comment.replyToken)
+/** @type {ShallowRef<Comment[]>} */
+const replies = shallowRef([])
+
+/** @type {ComputedRef<boolean>} */
+const hideCommentLikes = computed(() => {
+  return store.getters.getHideCommentLikes
+})
+
+/** @type {ComputedRef<boolean>} */
+const hideCommentPhotos = computed(() => {
+  return store.getters.getHideCommentPhotos
+})
+
+const enableChannelLinks = computed(() => !store.getters.getDisableChannelLinks)
+
+/** @type {ComputedRef<Set<string>>} */
+const subscribedChannelIds = computed(() => {
+  return store.getters.getActiveProfile.subscriptions.reduce((set, channel) => {
+    return set.add(channel.id)
+  }, new Set())
+})
+
+/**
+ * @param {string} channelId
+ */
+function isSubscribedToChannel(channelId) {
+  return subscribedChannelIds.value.has(channelId)
+}
+
+const numRepliesRemainingText = computed(() => {
+  if (props.comment.numReplies >= 1000) return ''
+  const numLoadedReplies = replies.value.reduce((sum, reply) => sum + 1 + reply.numReplies, 0)
+  const count = props.comment.numReplies - numLoadedReplies
+  return t('Global.Counts.Replies Remaining', { count }, count)
+})
+
+const toggleCommentRepliesText = computed(() => {
+  const channelName = props.channelName
+  const replyCount = props.comment.numReplies
+
+  if (showReplies.value) {
+    return t('Comments.Hide Replies', replyCount)
+  }
+
+  if (props.comment.hasOwnerReplied) {
+    if (replyCount > 1) {
+      return t('Comments.View {replyCount} replies from {channelName} and others', { replyCount, channelName })
+    }
+
+    return t('Comments.View 1 reply from {channelName}', { channelName })
+  }
+
+  return t('Comments.View {replyCount} replies', { replyCount: `${replyCount >= 1000 ? '~' : ''}${replyCount}` }, replyCount)
+})
+
+onMounted(() => {
+  if (!props.autoloadThisReplyLevel || !props.comment.numReplies) return
+  toggleCommentReplies()
+})
+
+function toggleCommentReplies() {
+  if (showReplies.value || replies.value.length > 0) {
+    showReplies.value = !showReplies.value
+  } else {
+    getCommentReplies()
+  }
+}
+
+async function getCommentReplies() {
+  if (repliesLoading.value) return
+
+  repliesLoading.value = true
+
+  if (!process.env.SUPPORTS_LOCAL_API || props.comment.dataType === 'invidious') {
+    await getCommentRepliesInvidious()
+  } else {
+    await getCommentRepliesLocal()
+  }
+
+  repliesLoading.value = false
+}
+
+async function getCommentRepliesLocal() {
+  try {
+    let commentThread = /** @type {LocalComment['replyToken']} */ (replyToken.value)
+    if (commentThread == null) return
+
+    /**
+     * @typedef {Awaited<ReturnType<
+     *   NonNullable<typeof commentThread>['getContinuation']
+     * >>} CommentsContinuation
+     */
+    /**
+     * @param {NonNullable<typeof commentThread>} _
+     * @return {_ is CommentsContinuation}
+     */
+    function isContinuation(_) {
+      return replies.value.length > 0
+    }
+
+    /** @param {CommentsContinuation['replies']} subThreads */
+    function processReplies(subThreads) {
+      return subThreads.reduce((replies, subThread) => {
+        return subThread.comment ? replies.concat(parseLocalComment(subThread.comment, subThread)) : replies
+      }, /** @type {LocalComment[]} */ ([]))
+    }
+
+    if (isContinuation(commentThread)) {
+      commentThread = await commentThread.getContinuation()
+      replies.value = replies.value.concat(processReplies(commentThread.replies))
+    } else {
+      if (!commentThread.is_prepopulated) {
+        await commentThread.getReplies()
+      }
+      replies.value = commentThread.replies ? processReplies(commentThread.replies) : []
+    }
+
+    if (commentThread.has_continuation) {
+      replyToken.value = commentThread
+    } else {
+      replyToken.value = null
+    }
+
+    showReplies.value = true
+  } catch (err) {
+    console.error(err)
+    const errorMessage = t('Local API Error (Click to copy)')
+    showToast(`${errorMessage}: ${err}`, 10000, () => {
+      copyToClipboard(err)
+    })
+    if (props.canFallbackToInvidious) {
+      showToast(t('Falling back to Invidious API'))
+      await getCommentRepliesInvidious()
+    }
+  }
+}
+
+async function getCommentRepliesInvidious() {
+  const fetchReplies = await props.getInvidiousCommentReplies(replyToken.value)
+  if (!fetchReplies) return
+
+  const { commentData, continuation } = fetchReplies
+  replies.value = replies.value.concat(commentData)
+  showReplies.value = true
+  replyToken.value = continuation ?? ''
+}
+
+</script>
+
+<style scoped src="./FtComment.css" />
diff --git a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
index 799ef9600eb00..f7bb8929f26c6 100644
--- a/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
+++ b/src/renderer/components/ft-shaka-video-player/ft-shaka-video-player.js
@@ -1518,6 +1518,7 @@ export default defineComponent({
 
       /** @type {object[]} */
       const legacyFormats = props.legacyFormats
+      if (legacyFormats.length === 0) { return }
 
       const isPortrait = legacyFormats[0].height > legacyFormats[0].width
 
@@ -2830,7 +2831,7 @@ export default defineComponent({
             forceAspectRatio.value = firstVariant.width / firstVariant.height < 1.5
           }
         })
-      } else {
+      } else if (props.legacyFormats.length > 0) {
         // force the player aspect ratio to 16:9 to avoid overflowing the layout, when the video is too tall
 
         const firstFormat = props.legacyFormats[0]
diff --git a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
index b5a286c8a129b..70179771be2ae 100644
--- a/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
+++ b/src/renderer/components/ft-shaka-video-player/player-components/LegacyQualitySelection.js
@@ -31,8 +31,10 @@ export class LegacyQualitySelection extends shaka.ui.SettingsMenu {
 
     const sortedLegacyFormats = [...legacyFormats]
 
-    const isPortrait = legacyFormats[0].height > legacyFormats[0].width
-    sortedLegacyFormats.sort((a, b) => isPortrait ? b.width - a.width : b.height - a.height)
+    if (legacyFormats.length > 0) {
+      const isPortrait = legacyFormats[0].height > legacyFormats[0].width
+      sortedLegacyFormats.sort((a, b) => isPortrait ? b.width - a.width : b.height - a.height)
+    }
 
     /** @private */
     this.legacyFormats_ = sortedLegacyFormats
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index b4c6a0b79567f..8d57c3062a96f 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -429,26 +429,47 @@ export async function invidiousGetVideoInformation(videoId) {
  * The complete Triforce, or one or more components of the Triforce.
  * @typedef {object} InvidiousComment
  * @property {string} id
- * @property {string} authorLink
- * @property {string} authorThumb
+ * @property {'invidious'} dataType
  * @property {string} author
+ * @property {string} authorId
+ * @property {string} authorThumb
  * @property {number} likes
  * @property {string} text
- * @property {string} dataType
+ * @property {string} time
+ * @property {boolean} isHearted
+ * @property {boolean} isMember
  * @property {boolean} isOwner
  * @property {boolean} isPinned
- * @property {number} numReplies
+ * @property {false} hasOwnerReplied
  * @property {boolean} hasReplyToken
  * @property {string} replyToken
- * @property {boolean} showReplies
- * @property {InvidiousComment[]} replies
- * @property {boolean} isHearted
- * @property {boolean} isMember
+ * @property {0} replyLevel
  * @property {string} memberIconUrl
- * @property {string} time
+ * @property {number} numReplies
+ */
+/**
+ * See: https://docs.invidious.io/api/#get-apiv1commentsid
+ * @typedef {{
+ *   commentCount: number,
+ *   videoId: string,
+ *   continuation: string?,
+ *   comments: {
+ *     authorId: string,
+ *     author: string,
+ *     authorThumbnail: string,
+ *     authorIsChannelOwner: boolean,
+ *     isSponsor: boolean,
+ *     sponsorIconUrl?: string,
+ *     likeCount: number,
+ *     creatorHeart?: object,
+ *     isPinned: boolean,
+ *     commentId: string,
+ *     contentHtml: string,
+ *     published: number,
+ *     replies?: {replyCount: number, continuation: string}
+ *   }[]
+ * }} InvidiousCommentResponse
  */
-/** @typedef {{commentCount: number, videoId: string, continuation: string?, comments: InvidiousComment[]}} InvidiousCommentResponse */
-
 export async function invidiousGetComments({ id, nextPageToken = '', sortNewest = true }) {
   const payload = {
     resource: 'comments',
@@ -577,14 +598,12 @@ export async function getInvidiousSearchResults(query, page, searchSettings) {
 }
 
 /**
- * @param {string} url
+ * @param {string | undefined | null} url
  * @param {string?} currentInstance
- * @returns {string?}
+ * @returns {string}
  */
 export function youtubeImageUrlToInvidious(url, currentInstance = null) {
-  if (url == null) {
-    return null
-  }
+  if (!url) return ''
 
   if (currentInstance === null) {
     currentInstance = getCurrentInstanceUrl()
@@ -600,34 +619,35 @@ export function youtubeImageUrlToInvidious(url, currentInstance = null) {
 }
 
 /**
- * @param {string} url
+ * @param {string | undefined | null} url
  * @param {string?} currentInstance
  * @returns {string}
  */
 export function invidiousImageUrlToInvidious(url, currentInstance = null) {
-  return url.replaceAll('/ggpht/', `${currentInstance}/ggpht/`)
+  return url?.replaceAll('/ggpht/', `${currentInstance}/ggpht/`) ?? ''
 }
 
 /**
  * @param {InvidiousCommentResponse} response
+ * @returns {InvidiousComment[]}
  */
 function parseInvidiousCommentData(response) {
   return response.comments.map((comment) => {
     return {
       id: comment.commentId,
-      authorLink: comment.authorId,
-      authorThumb: youtubeImageUrlToInvidious(comment.authorThumbnails.at(-1).url),
+      dataType: 'invidious',
+      authorId: comment.authorId,
+      authorThumb: youtubeImageUrlToInvidious(comment.authorThumbnail),
       author: comment.author,
       likes: comment.likeCount,
       text: autolinker.link(invidiousImageUrlToInvidious(comment.contentHtml, getCurrentInstanceUrl())),
-      dataType: 'invidious',
       isOwner: comment.authorIsChannelOwner,
       isPinned: comment.isPinned,
       numReplies: comment.replies?.replyCount ?? 0,
+      hasOwnerReplied: false,
       hasReplyToken: !!comment.replies?.continuation,
       replyToken: comment.replies?.continuation ?? '',
-      showReplies: false,
-      replies: [],
+      replyLevel: 0,
       isHearted: comment.creatorHeart !== undefined,
       isMember: comment.isSponsor,
       memberIconUrl: youtubeImageUrlToInvidious(comment.sponsorIconUrl),
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 4aba2028d7cd6..e5d0fe77e49f9 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -379,12 +379,12 @@ export async function getLocalSearchContinuation(continuationData) {
 }
 
 /**
- * @param {string} videoId
- * @param {(input, init) => Promise<Response>} fetchFunc
+ * @param {string} url
+ * @param {string} kind
  */
-async function getWatchHTMLWatchPage(videoId, fetchFunc) {
+async function getHTMLPage(url, kind) {
   // This returns session/tracking cookies but they get removed in onHeadersReceived in the main process before they are saved by Electron
-  const htmlResponse = await fetch(`https://www.youtube.com/watch?v=${videoId}&bpctr=9999999999&has_verified=1`,
+  const htmlResponse = await fetch(url,
     {
       headers: {
         // We need to be able to parse the localised strings in the /next response data (e.g. view counts and published dates)
@@ -398,7 +398,7 @@ async function getWatchHTMLWatchPage(videoId, fetchFunc) {
   const ytConfigStr = htmlPage.match(/ytcfg\.set\(({.+?})\);/s)?.[1]
   if (!ytConfigStr) {
     // required for botguard
-    throw new Error('Could not find ytcfg in the HTML page')
+    throw new Error(`Could not find ytcfg in the ${kind} HTML page`)
   }
 
   const ytConfig = JSON.parse(ytConfigStr)
@@ -407,7 +407,7 @@ async function getWatchHTMLWatchPage(videoId, fetchFunc) {
 
   if (!initialAttestationDataMatch) {
     // required for botguard
-    throw new Error('Could not find challenge in the HTML page')
+    throw new Error(`Could not find challenge in the ${kind} HTML page`)
   }
 
   let initialAttestationData
@@ -415,42 +415,74 @@ async function getWatchHTMLWatchPage(videoId, fetchFunc) {
   try {
     initialAttestationData = parseLooseJSON(initialAttestationDataMatch[1])
   } catch (e) {
-    const error = new Error('Failed to parse the initial attestation data', { cause: e })
+    const error = new Error(`Failed to parse the ${kind} home page initial attestation data`, { cause: e })
     console.error(error, initialAttestationDataMatch[1])
     throw error
   }
 
-  /** @type {string | undefined} */
   let playerId = ytConfig.PLAYER_JS_URL?.match(/player\/([^/]+)\//)?.[1]
 
   playerId ??= htmlPage.match(/<script[^>]+src="[^">]+player\/([^/]+)\/[^"]+\/base.js"/)?.[1]
 
-  const playerResponseStr = htmlPage.match(/ytInitialPlayerResponse\s*=\s*(\{.+?\});/)?.[1]
-  let playerResponse
-
-  // not fatal if it is missing as we can retrieve it from Innertube ourselves
-  if (playerResponseStr) {
-    try {
-      playerResponse = JSON.parse(playerResponseStr)
-    } catch (e) {
-      console.warn('/player response extracted from the HTML page is invalid JSON', e)
-    }
-  } else {
-    console.warn('Could not find /player response in the HTML page')
+  return {
+    htmlPage,
+    ytConfig,
+    initialAttestationData,
+    playerId
   }
+}
 
-  const nextResponseStr = htmlPage.match(/(?:window\s*\[\s*["']ytInitialData["']\s*\]|ytInitialData)\s*=\s*(\{.+?\});/)?.[1]
-  let nextResponse
+/**
+ * @param {string} videoId
+ * @param {(input, init) => Promise<Response>} fetchFunc
+ */
+async function getWatchHTMLWatchPage(videoId, fetchFunc) {
+  let htmlPage, ytConfig, initialAttestationData
+
+  let playerResponse, nextResponse
+  /** @type {string | undefined} */
+  let playerId
 
-  // not fatal if it is missing as we can retrieve it from Innertube ourselves
-  if (nextResponseStr) {
+  if (sessionStorage.getItem('playerHtmlHomepageFallback') === '1') {
+    ({ ytConfig, initialAttestationData, playerId } = await getHTMLPage('https://www.youtube.com', 'home'))
+  } else {
     try {
-      nextResponse = JSON.parse(nextResponseStr)
-    } catch (e) {
-      console.warn('/next response extracted from the HTML page is invalid JSON', e)
+      ({ htmlPage, ytConfig, initialAttestationData, playerId } = await getHTMLPage(`https://www.youtube.com/watch?v=${videoId}&bpctr=9999999999&has_verified=1`, 'watch'))
+
+      const playerResponseStr = htmlPage.match(/ytInitialPlayerResponse\s*=\s*(\{.+?\});/)?.[1]
+
+      // not fatal if it is missing as we can retrieve it from Innertube ourselves
+      if (playerResponseStr) {
+        try {
+          playerResponse = JSON.parse(playerResponseStr)
+        } catch (e) {
+          console.warn('/player response extracted from the HTML page is invalid JSON', e)
+        }
+      } else {
+        console.warn('Could not find /player response in the HTML page')
+      }
+
+      const nextResponseStr = htmlPage.match(/(?:window\s*\[\s*["']ytInitialData["']\s*\]|ytInitialData)\s*=\s*(\{.+?\});/)?.[1]
+
+      // not fatal if it is missing as we can retrieve it from Innertube ourselves
+      if (nextResponseStr) {
+        try {
+          nextResponse = JSON.parse(nextResponseStr)
+        } catch (e) {
+          console.warn('/next response extracted from the HTML page is invalid JSON', e)
+        }
+      } else {
+        console.warn('Could not find /next response in the HTML page')
+      }
+    } catch (watchError) {
+      console.warn('Falling back to the YT home page for the rest of the session because of:', watchError)
+
+      // Fall back to the home page for the rest of the session/until FreeTube is restarted
+      // assuming that getting the watch page captcha once is a sign that it will continue happening
+      sessionStorage.setItem('playerHtmlHomepageFallback', '1');
+
+      ({ ytConfig, initialAttestationData, playerId } = await getHTMLPage('https://www.youtube.com', 'home'))
     }
-  } else {
-    console.warn('Could not find /next response in the HTML page')
   }
 
   const session = buildSessionFromYtConfig(ytConfig, fetchFunc)
@@ -772,7 +804,7 @@ function extractTotalAdTimeMilliseconds(json) {
  * @param {string} id
  */
 export async function getLocalComments(id) {
-  const innertube = await createInnertube()
+  const innertube = await createInnertube({ generateSessionLocally: false })
   return innertube.getComments(id)
 }
 
@@ -2219,51 +2251,47 @@ export function mapLocalLegacyFormat(format) {
  * The complete Triforce, or one or more components of the Triforce.
  * @typedef {object} LocalComment
  * @property {string} id
- * @property {string} dataType
- * @property {string} authorLink
+ * @property {'local'} dataType
  * @property {string} author
  * @property {string} authorId
  * @property {string} authorThumb
- * @property {boolean} isPinned
- * @property {boolean} isOwner
- * @property {boolean} isMember
+ * @property {number} likes
  * @property {string} text
+ * @property {string} time
  * @property {boolean} isHearted
+ * @property {boolean} isMember
+ * @property {boolean} isOwner
+ * @property {boolean} isPinned
  * @property {boolean} hasOwnerReplied
  * @property {boolean} hasReplyToken
- * @property {CommentThread} replyToken
- * @property {boolean} showReplies
- * @property {LocalComment[]} replies
+ * @property {(YTNodes.CommentThread | Misc.CommentsContinuation)?} replyToken
+ * @property {number} replyLevel
  * @property {string} memberIconUrl
- * @property {string} time
- * @property {number} likes
  * @property {number} numReplies
  */
 /**
  * @param {import('youtubei.js').YTNodes.CommentView} comment
- * @param {import('youtubei.js').YTNodes.CommentThread} commentThread
- * @return LocalComment
+ * @param {import('youtubei.js').YTNodes.CommentThread | undefined} commentThread
+ * @return {LocalComment}
  */
 export function parseLocalComment(comment, commentThread = undefined) {
+  const replyToken = commentThread ?? null
   let hasOwnerReplied = false
-  let replyToken = null
   let hasReplyToken = false
 
   if (commentThread?.has_replies) {
-    hasOwnerReplied = commentThread.comment_replies_data.has_channel_owner_replied
-    replyToken = commentThread
+    hasOwnerReplied = !!commentThread.comment_replies_data?.has_channel_owner_replied
     hasReplyToken = true
   }
 
-  const commentTextRuns = comment.voice_reply_container?.transcript_text ? comment.voice_reply_container.transcript_text.runs : comment.content.runs
+  const commentTextRuns = comment.voice_reply_container?.transcript_text?.runs ?? comment.content?.runs ?? []
 
   return {
     id: comment.comment_id,
     dataType: 'local',
-    authorLink: comment.author.id,
-    author: comment.author.name,
-    authorId: comment.author.id,
-    authorThumb: comment.author.best_thumbnail.url,
+    author: comment.author?.name ?? '',
+    authorId: comment.author?.id ?? '',
+    authorThumb: comment.author?.best_thumbnail?.url ?? '',
     isPinned: comment.is_pinned,
     isOwner: !!comment.author_is_channel_owner,
     isMember: !!comment.is_member,
@@ -2272,12 +2300,11 @@ export function parseLocalComment(comment, commentThread = undefined) {
     hasOwnerReplied,
     hasReplyToken,
     replyToken,
-    showReplies: false,
-    replies: [],
-    memberIconUrl: comment.is_member ? comment.member_badge.url : '',
-    time: getRelativeTimeFromDate(calculatePublishedDate(comment.published_time.replace('(edited)', '').trim()), false),
-    likes: comment.like_count,
-    numReplies: parseLocalSubscriberCount(comment.reply_count)
+    replyLevel: comment.reply_level ?? 0,
+    memberIconUrl: comment.member_badge?.url ?? '',
+    time: getRelativeTimeFromDate(calculatePublishedDate((comment.published_time ?? '').replace('(edited)', '').trim()) ?? 0, false),
+    likes: parseLocalSubscriberCount(comment.like_count?.trim() || '0'),
+    numReplies: hasReplyToken ? parseLocalSubscriberCount(comment.reply_count_a11y ?? '0') : 0
   }
 }
 
@@ -2451,7 +2478,7 @@ export async function getLocalCommunityPost(postId, channelId) {
  * @param {string} channelId
  */
 export async function getLocalCommunityPostComments(postId, channelId) {
-  const innertube = await createInnertube()
+  const innertube = await createInnertube({ generateSessionLocally: false })
 
   return await innertube.getPostComments(postId, channelId)
 }
diff --git a/src/renderer/helpers/player/SabrSchemePlugin.js b/src/renderer/helpers/player/SabrSchemePlugin.js
index c073cdbd84105..4e85dca6fc751 100644
--- a/src/renderer/helpers/player/SabrSchemePlugin.js
+++ b/src/renderer/helpers/player/SabrSchemePlugin.js
@@ -374,7 +374,7 @@ async function doRequest(
             const sabrRedirect = decodePart(part, SabrRedirect)
             if (!sabrRedirect) break
 
-            currentState.sabrUrl = sabrRedirect.url
+            currentState.sabrStreamState.sabrUrl = sabrRedirect.url
             shouldRetry = true
             break
           }
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 526aa88984e35..1b4aa2522f2ca 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -942,6 +942,12 @@ export default defineComponent({
           }
         }
 
+        if (this.activeFormat === 'legacy' && (this.isLive || this.isPostLiveDvr || this.legacyFormats.length === 0)) {
+          // Legacy wanted as default but unavailable
+          showToast(this.t('Change Format.Legacy formats are not available for this video'))
+          this.handleActiveFormatUnavailable()
+        }
+
         this.isLoading = false
         this.updateTitle()
       } catch (err) {
@@ -1602,6 +1608,10 @@ export default defineComponent({
         }
       }
 
+      this.handleActiveFormatUnavailable()
+    },
+
+    handleActiveFormatUnavailable: function() {
       if (this.isLive || this.isPostLiveDvr) {
         // live streams don't have legacy formats, so only switch between dash and audio
 
diff --git a/static/locales/ar.yaml b/static/locales/ar.yaml
index 5ad766fdd477c..7be687971f42e 100644
--- a/static/locales/ar.yaml
+++ b/static/locales/ar.yaml
@@ -908,7 +908,6 @@ Mini Player: 'المشغل المصغّر'
 Comments:
   Comments: 'التعليقات'
   Click to View Comments: 'انقر لمشاهدة التعليقات'
-  Getting comment replies, please wait: 'جاري الحصول على ردود التعليق, يرجى الانتظار'
   Hide Comments: 'إخفاء التعليقات'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'لا يتوفر تعليقات لهذا الفيديو'
diff --git a/static/locales/awa.yaml b/static/locales/awa.yaml
index 9b81c16d82e6b..57dbd0cc6c0f4 100644
--- a/static/locales/awa.yaml
+++ b/static/locales/awa.yaml
@@ -896,7 +896,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/be.yaml b/static/locales/be.yaml
index a4a0fb8fb080f..ea5a15f818e73 100644
--- a/static/locales/be.yaml
+++ b/static/locales/be.yaml
@@ -905,7 +905,6 @@ Mini Player: 'Міні плэер'
 Comments:
   Comments: 'Каментарыі'
   Click to View Comments: 'Націсніце, каб праглядзець каментарыі'
-  Getting comment replies, please wait: 'Атрымліваюцца адказы на каментарыі, пачакайце'
   There are no more comments for this video: 'Да гэтага відэа больш няма каментарыяў'
   Hide Comments: 'Схаваць каментарыі'
   Top comments: 'Папулярныя каментарыі'
@@ -920,6 +919,7 @@ Comments:
   Subscribed: 'Падпісан'
   Hearted: 'З сэрцам'
   There are no comments available for this post: Да гэтай публікацыі няма каментарыяў
+  Hide Replies: Схаваць адказ | Схаваць адказы
 Up Next: 'Далей'
 
 #Tooltips
diff --git a/static/locales/bg.yaml b/static/locales/bg.yaml
index 800b89a323b78..2de941742802e 100644
--- a/static/locales/bg.yaml
+++ b/static/locales/bg.yaml
@@ -908,7 +908,6 @@ Mini Player: 'Мини плейър'
 Comments:
   Comments: 'Коментари'
   Click to View Comments: 'Щракнете, за да видите коментарите'
-  Getting comment replies, please wait: 'Получаване на отговори на коментара, моля изчакайте'
   There are no more comments for this video: 'Към това видео няма повече коментари'
   Hide Comments: 'Скриване на коментарите'
   # Context: View 10 Replies, View 1 Reply
diff --git a/static/locales/br.yaml b/static/locales/br.yaml
index 34724cdb59cfc..36f757f4f7bdd 100644
--- a/static/locales/br.yaml
+++ b/static/locales/br.yaml
@@ -984,7 +984,6 @@ Mini Player: 'Lenner bihan'
 Comments:
   Comments: 'Evezhiadennoù'
   Click to View Comments: 'Klikit amañ evit gwelet an evezhiadennoù'
-  Getting comment replies, please wait: 'O kerc''hat respontoù an evezhiadennoù, gortozit mar plij'
   There are no more comments for this video: 'Evezhiadenn ouzhpenn ebet evit ar video-mañ'
   Hide Comments: 'Kuzhat an evezhiadennoù'
   Top comments: 'Evezhiadennoù gwellañ'
diff --git a/static/locales/ckb.yaml b/static/locales/ckb.yaml
index 253beaf5958fd..f376849262073 100644
--- a/static/locales/ckb.yaml
+++ b/static/locales/ckb.yaml
@@ -752,7 +752,6 @@ Mini Player: 'لێدەری گچکە'
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/cs.yaml b/static/locales/cs.yaml
index b6064906d9028..e82639d2b1a88 100644
--- a/static/locales/cs.yaml
+++ b/static/locales/cs.yaml
@@ -40,6 +40,7 @@ Global:
     Watching Count: 1 sledující | {count} sledujících
     Like Count: 1 líbí se mi | {count} líbí se mi
     Comment Count: 1 komentář | {count} komentářů
+    Replies Remaining: "{' '}(zbývá 1) | {' '}(zbývá {count})"
 Version {versionNumber} is now available!  Click for more details: 'Je k dispozici verze {versionNumber}! Klikněte pro více informací'
 Download From Site: 'Stáhnout ze stránky'
 
@@ -927,7 +928,6 @@ Mini Player: 'Mini přehrávač'
 Comments:
   Comments: 'Komentáře'
   Click to View Comments: 'Kliknutím zobrazíte komentáře'
-  Getting comment replies, please wait: 'Načítání odpovědí na komentář, čekejte prosím'
   There are no more comments for this video: 'U tohoto videa nejsou žádné další komentáře'
   Hide Comments: 'Skrýt komentáře'
   Top comments: 'Nejlepší komentáře'
@@ -935,14 +935,14 @@ Comments:
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'K tomuto videu nejsou dostupné žádné komentáře'
   Load More Comments: 'Načíst další komentáře'
-  Show More Replies: Načíst více výsledků
+  Show More Replies: Načíst další odpovědi
   Pinned by: připnuto uživatelem
   Member: Člen
   View {replyCount} replies: Zobrazit 1 odpověď | Zobrazit {replyCount} odpovědí
   Hearted: Se srdíčkem
   Subscribed: Odebíráno
   There are no comments available for this post: U tohoto příspěvku nejsou dostupné žádné komentáře
-  Hide {replyCount} replies: Skrýt 1 odpověď | Skrýt {replyCount} odpovědí
+  Hide Replies: Skrýt odpověď | Skrýt odpovědi
   View 1 reply from {channelName}: Zobrazit 1 odpověď od {channelName}
   View {replyCount} replies from {channelName} and others: Zobrazit {replyCount} odpovědí od {channelName} a dalších
 Up Next: 'Další'
diff --git a/static/locales/cy.yaml b/static/locales/cy.yaml
index d00f1a7cfa43a..f17782d154a49 100644
--- a/static/locales/cy.yaml
+++ b/static/locales/cy.yaml
@@ -937,7 +937,6 @@ Mini Player: 'Chwaraewr Bach'
 Comments:
   Comments: 'Sylwadau'
   Click to View Comments: 'Cliciwch i Weld Sylwadau'
-  Getting comment replies, please wait: 'Yn derbyn atebion sylwadau, arhoswch'
   There are no more comments for this video: 'Nid oes mwy o sylwadau ar gyfer y fideo hwn'
   Hide Comments: 'Cuddio Sylwadau'
   Top comments: 'Sylwadau poblogaidd'
diff --git a/static/locales/da.yaml b/static/locales/da.yaml
index cf05c7b8b341b..1bc87fdd2ecf1 100644
--- a/static/locales/da.yaml
+++ b/static/locales/da.yaml
@@ -36,6 +36,7 @@ Global:
     Channel Count: 1 kanal | {count} kanaler
     Comment Count: 1 kommentar | {count} kommentarer
     Like Count: 1 kan lide | {count} kan lide
+    Replies Remaining: "{' '}(1 tilbage) | {' '}({count} tilbage)"
   Posts: Opslag
   Live: Live
   Sort By: Sortér efter
@@ -883,7 +884,6 @@ Mini Player: 'Miniafspiller'
 Comments:
   Comments: 'Kommentarer'
   Click to View Comments: 'Klik for at vise kommentarer'
-  Getting comment replies, please wait: 'Henter kommentarsvar; vent venligst'
   There are no more comments for this video: 'Der er ikke flere kommentarer til denne video'
   Hide Comments: 'Skjul kommentarer'
   # Context: View 10 Replies, View 1 Reply
@@ -898,6 +898,9 @@ Comments:
   View {replyCount} replies: Se {replyCount} svar
   Hearted: Hjerte
   There are no comments available for this post: Der er ingen tilgængelige kommentarer til dette opslag
+  Hide Replies: Skjul svar
+  View 1 reply from {channelName}: Se 1 svar fra {channelName}
+  View {replyCount} replies from {channelName} and others: Se {replyCount} svar fra {channelName} og andre
 Up Next: 'Næste'
 
 # Toast Messages
diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 61aea454763cc..2e8dbcf006f3f 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -38,6 +38,7 @@ Global:
     Watching Count: 1 Zuschauer | {count} Zuschauende
     Comment Count: 1 Kommentar | {count} Kommentare
     Like Count: 1 Gefällt mir | {count} Gefällt mir
+    Replies Remaining: "{' '}(1 verbleibend) | {' '}({count} verbleibend)"
 Search / Go to URL: Suchen / URL öffnen
   # In Filter Button
 Search Filters:
@@ -878,8 +879,7 @@ Mini Player: Mini-Video-Player
 Comments:
   Comments: Kommentare
   Click to View Comments: Kommentare anzeigen
-  Getting comment replies, please wait: Antworten auf Kommentare werden geladen, bitte warten
-  Hide Comments: Kommentare ausblenden
+  Hide Comments: Kommentar ausblenden | Kommentare ausblenden
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: Keine Kommentare zu diesem Video vorhanden
   Load More Comments: Weitere Kommentare laden
@@ -893,7 +893,7 @@ Comments:
   Hearted: Gefällt mir
   Subscribed: Abonniert
   There are no comments available for this post: Keine Kommentare für diesen Beitrag vorhanden
-  Hide {replyCount} replies: 1 Antwort ausblenden | {replyCount} Antworten ausblenden
+  Hide Replies: Antworten ausblenden
   View 1 reply from {channelName}: 1 Antwort von {channelName} ansehen
   View {replyCount} replies from {channelName} and others: '{replyCount} Antworten von {channelName} und anderen ansehen'
 Up Next: Nächster Titel
diff --git a/static/locales/el.yaml b/static/locales/el.yaml
index 38ea91f92c5e5..266c784305ad5 100644
--- a/static/locales/el.yaml
+++ b/static/locales/el.yaml
@@ -905,7 +905,6 @@ Mini Player: 'Μικρή πλατφόρμα αναπαραγωγής'
 Comments:
   Comments: 'Σχόλια'
   Click to View Comments: 'Κάντε κλικ για να δείτε σχόλια'
-  Getting comment replies, please wait: 'Λήψη απαντήσεων σε σχόλια, παρακαλώ περιμένετε'
   Hide Comments: 'Απόκρυψη σχολίων'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Δεν υπάρχουν διαθέσιμα σχόλια γι αυτό το βίντεο'
diff --git a/static/locales/en-GB.yaml b/static/locales/en-GB.yaml
index 5a2f3d7e7ceb8..a6a876f19d084 100644
--- a/static/locales/en-GB.yaml
+++ b/static/locales/en-GB.yaml
@@ -40,6 +40,7 @@ Global:
     Channel Count: 1 channel | {count} channels
     Like Count: 1 like | {count} likes
     Comment Count: 1 comment | {count} comments
+    Replies Remaining: "{' '}(1 remaining) | {' '}({count} remaining)"
 Version {versionNumber} is now available!  Click for more details: 'Version {versionNumber} is now available!  Click for more details'
 Download From Site: 'Download From Site'
 
@@ -914,7 +915,6 @@ Mini Player: 'Mini Player'
 Comments:
   Comments: 'Comments'
   Click to View Comments: 'Click to View Comments'
-  Getting comment replies, please wait: 'Getting comment replies, please wait'
   There are no more comments for this video: 'There are no more comments for this video'
   Hide Comments: 'Hide Comments'
   # Context: View 10 Replies, View 1 Reply
@@ -929,7 +929,7 @@ Comments:
   View {replyCount} replies: View 1 reply | View {replyCount} replies
   Subscribed: Subscribed
   There are no comments available for this post: There are no comments available for this post
-  Hide {replyCount} replies: Hide 1 reply | Hide {replyCount} replies
+  Hide Replies: Hide reply | Hide replies
   View 1 reply from {channelName}: View 1 reply from {channelName}
   View {replyCount} replies from {channelName} and others: View {replyCount} replies from {channelName} and others
 Up Next: 'Up Next'
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index f0cc5ab82004e..d8afc7b12f149 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -52,6 +52,7 @@ Global:
     Like Count: 1 like | {count} likes
     Comment Count: 1 comment | {count} comments
     Watching Count: 1 watching | {count} watching
+    Replies Remaining: "{' '}(1 remaining) | {' '}({count} remaining)"
 
 # Search Bar
 Search / Go to URL: Search / Go to URL
@@ -1023,16 +1024,16 @@ Mini Player: Mini Player
 Comments:
   Comments: Comments
   Click to View Comments: Click to View Comments
-  Getting comment replies, please wait: Getting comment replies, please wait
   There are no more comments for this video: There are no more comments for this video
   Hide Comments: Hide Comments
   Top comments: Top comments
   Newest first: Newest First
   View {replyCount} replies: View 1 reply | View {replyCount} replies
-  Hide {replyCount} replies: Hide 1 reply | Hide {replyCount} replies
+  Hide Replies: Hide reply | Hide replies
+  Loading replies: Loading replies...
   View 1 reply from {channelName}: View 1 reply from {channelName}
   View {replyCount} replies from {channelName} and others: View {replyCount} replies from {channelName} and others
-  Show More Replies: Show More Replies
+  Show More Replies: Show more replies
   There are no comments available for this video: There are no comments available
     for this video
   There are no comments available for this post: There are no comments available for this post
diff --git a/static/locales/eo.yaml b/static/locales/eo.yaml
index a2aac153db0ef..de92c97cdbbba 100644
--- a/static/locales/eo.yaml
+++ b/static/locales/eo.yaml
@@ -977,13 +977,12 @@ Mini Player: Ludileto
 Comments:
   Comments: Komentoj
   Click to View Comments: Alklaku por vidi komentojn
-  Getting comment replies, please wait: Venigado de respondoj, bonvolu atendi
   There are no more comments for this video: Ne estas pli da komentoj por tiu ĉi videaĵo
   Hide Comments: Kaŝi komentojn
   Top comments: Plej bonaj komentoj
   Newest first: Plej novaj unue
   View {replyCount} replies: Vidi 1 respondon | Vidi {replyCount} respondojn
-  Hide {replyCount} replies: Kaŝi 1 respondon | Kaŝi {replyCount} respondojn
+  Hide Replies: Kaŝi respondon | Kaŝi respondojn
   View 1 reply from {channelName}: Vidi 1 respondon de {channelName}
   View {replyCount} replies from {channelName} and others: Vidi {replyCount} respondojn de {channelName} kaj aliaj
   Show More Replies: Montri pli da respondoj
diff --git a/static/locales/es-MX.yaml b/static/locales/es-MX.yaml
index 848a4a0a2ec9a..105bd2c3df4aa 100644
--- a/static/locales/es-MX.yaml
+++ b/static/locales/es-MX.yaml
@@ -576,7 +576,6 @@ Mini Player: 'Mini reproductor'
 Comments:
   Comments: 'Comentarios'
   Click to View Comments: 'Presione para Ver Comentarios'
-  Getting comment replies, please wait: 'Recibiendo respuestas de comentarios, por favor espere'
   Hide Comments: 'Esconde comentarios'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'No hay comentarios disponibles para este video'
diff --git a/static/locales/es.yaml b/static/locales/es.yaml
index 111f2599645cc..e90e3325b2223 100644
--- a/static/locales/es.yaml
+++ b/static/locales/es.yaml
@@ -41,6 +41,7 @@ Global:
     Watching Count: 1 espectador | {count} espectadores
     Comment Count: 1 comentario | {count} comentarios
     Like Count: 1 me gusta | {count} me gustan
+    Replies Remaining: "{' '}(queda 1) | {' '}(quedan {count})"
 Search / Go to URL: 'Buscar / Ir a la URL'
   # In Filter Button
 Search Filters:
@@ -910,7 +911,6 @@ Mini Player: 'Minirreproductor'
 Comments:
   Comments: 'Comentarios'
   Click to View Comments: 'Pulse para ver comentarios'
-  Getting comment replies, please wait: 'Obteniendo las respuestas. Espere'
   Hide Comments: 'Ocultar comentarios'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Aún no hay comentarios'
@@ -927,7 +927,7 @@ Comments:
   There are no comments available for this post: No hay comentarios disponibles para este tema
   View 1 reply from {channelName}: Ver 1 respuesta de {channelName}
   View {replyCount} replies from {channelName} and others: Ver {replyCount} respuesta de {channelName} y otros
-  Hide {replyCount} replies: Ocultar 1 respuesta | Ocultar {replyCount} respuestas
+  Hide Replies: Ocultar respuesta | Ocultar respuestas
 Up Next: 'A continuación'
 
 # Toast Messages
diff --git a/static/locales/et.yaml b/static/locales/et.yaml
index a2b9545ae0a90..906cadba8e0e0 100644
--- a/static/locales/et.yaml
+++ b/static/locales/et.yaml
@@ -922,7 +922,6 @@ Mini Player: 'Kompaktne vaade'
 Comments:
   Comments: 'Kommentaarid'
   Click to View Comments: 'Kommentaaride vaatamiseks klõpsi'
-  Getting comment replies, please wait: 'Laadin kommentaari vastuseid, palun oota'
   There are no more comments for this video: 'Sellel videol ei ole rohkem kommentaare'
   Hide Comments: 'Peida kommentaarid'
   # Context: View 10 Replies, View 1 Reply
diff --git a/static/locales/eu.yaml b/static/locales/eu.yaml
index 6eca2c6251c5c..431f1c5d0db7a 100644
--- a/static/locales/eu.yaml
+++ b/static/locales/eu.yaml
@@ -914,7 +914,6 @@ Mini Player: 'Erreproduzitzaile txikia'
 Comments:
   Comments: 'Iruzkinak'
   Click to View Comments: 'Egin klik iruzkinak ikusteko'
-  Getting comment replies, please wait: 'Iruzkinen erantzunak eskuratzen. Itxaron mesedez'
   There are no more comments for this video: 'Ez dago iruzkin gehiagorik bideo honentzat'
   Hide Comments: 'Ezkutatu iruzkinak'
   Top comments: 'Iruzkin nagusiak'
diff --git a/static/locales/fa.yaml b/static/locales/fa.yaml
index 5dd5abcaf5692..2d71cc4da23d7 100644
--- a/static/locales/fa.yaml
+++ b/static/locales/fa.yaml
@@ -879,7 +879,6 @@ Comments:
   Load More Comments: بارگذاری نظرات بیشتر
   There are no comments available for this video: هیچ نظری برای این ویدیو موجود نیست
   Comments: نظرات
-  Getting comment replies, please wait: در حال دریافت پاسخ نظرات، لطفا صبر کنید
   There are no more comments for this video: هیچ نظر دیگری برای این ویدیو وجود ندارد
   Hide Comments: پنهان کردن نظرات
   Top comments: نظرات برتر
diff --git a/static/locales/fi.yaml b/static/locales/fi.yaml
index 4c410abf51a43..b78368deeedcf 100644
--- a/static/locales/fi.yaml
+++ b/static/locales/fi.yaml
@@ -857,7 +857,6 @@ Mini Player: 'Pieni soitin'
 Comments:
   Comments: 'Kommentit'
   Click to View Comments: 'Napsauta avataksesi kommentit'
-  Getting comment replies, please wait: 'Haetaan vastauksia, odota hetki'
   Hide Comments: 'Piilota kommentit'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Tähän videoon ei ole yhtään kommenttia'
diff --git a/static/locales/fr-FR.yaml b/static/locales/fr-FR.yaml
index 199869e744abe..5ebc45be49129 100644
--- a/static/locales/fr-FR.yaml
+++ b/static/locales/fr-FR.yaml
@@ -38,6 +38,7 @@ Global:
     Watching Count: 1 spectateur | {count} spectateurs
     Comment Count: 1 commentaire | {count} commentaires
     Like Count: 1 j’aime | {count} j’aime
+    Replies Remaining: "{' '}(1 restante) | {' '}({count} restantes)"
 Search / Go to URL: 'Rechercher / ouvrir l''URL'
   # In Filter Button
 Search Filters:
@@ -879,7 +880,6 @@ Mini Player: 'Mini-lecteur'
 Comments:
   Comments: 'Commentaires'
   Click to View Comments: 'Afficher les commentaires'
-  Getting comment replies, please wait: 'Récupération des commentaires, veuillez patienter'
   Hide Comments: 'Masquer les commentaires'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Il n''y a aucun commentaire pour cette vidéo'
@@ -894,7 +894,7 @@ Comments:
   View {replyCount} replies: Voir 1 réponse | Voir {replyCount} réponses
   Subscribed: Abonné(e)
   There are no comments available for this post: Il n'y a pas de commentaire associé à ce message
-  Hide {replyCount} replies: Masquer 1 réponse | Masquer {replyCount} réponses
+  Hide Replies: Masquer la réponse | Masquer les réponses
   View 1 reply from {channelName}: Voir 1 réponse de {channelName}
   View {replyCount} replies from {channelName} and others: Afficher {replyCount} réponses de {channelName} et autres
 Up Next: 'À suivre'
diff --git a/static/locales/gl.yaml b/static/locales/gl.yaml
index e0763e14f9a2a..d972a6af53601 100644
--- a/static/locales/gl.yaml
+++ b/static/locales/gl.yaml
@@ -908,7 +908,6 @@ Mini Player: 'Mini-reprodutor'
 Comments:
   Comments: 'Comentarios'
   Click to View Comments: 'Premer para ver comentarios'
-  Getting comment replies, please wait: 'Obtendo respostas ao comentario. Por favor, agarda'
   There are no more comments for this video: 'Non hai máis comentarios neste vídeo'
   Hide Comments: 'Agochar comentarios'
   Top comments: 'Comentarios destacados'
diff --git a/static/locales/he.yaml b/static/locales/he.yaml
index efce06376255b..5b41be9fbd8c0 100644
--- a/static/locales/he.yaml
+++ b/static/locales/he.yaml
@@ -909,7 +909,6 @@ Mini Player: 'נגן מזערי'
 Comments:
   Comments: 'תגובות'
   Click to View Comments: 'לחיצה לצפייה בתגובות'
-  Getting comment replies, please wait: 'תשובות לתגובה נטענות, נא להמתין'
   There are no more comments for this video: 'לסרטון הזה אין תגובות'
   Hide Comments: 'הסתרת תגובות'
   # Context: View 10 Replies, View 1 Reply
diff --git a/static/locales/hr.yaml b/static/locales/hr.yaml
index b1e6b16bdc58f..9aef26902aa1d 100644
--- a/static/locales/hr.yaml
+++ b/static/locales/hr.yaml
@@ -905,7 +905,6 @@ Mini Player: 'Mali player'
 Comments:
   Comments: 'Komentari'
   Click to View Comments: 'Pritisni za prikaz komentara'
-  Getting comment replies, please wait: 'Preuzimaju se odgovori na komentare. Pričekaj'
   Hide Comments: 'Sakrij komentare'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Za ovaj video nema komentara'
@@ -920,7 +919,7 @@ Comments:
   View {replyCount} replies: Pogledaj 1 odgovor | Pogledaj {replyCount} odgovora
   Subscribed: Pretplaćeno
   There are no comments available for this post: Za ovaj post nema komentara
-  Hide {replyCount} replies: Sakrij 1 odgovor | Sakrij {replyCount} odgovora
+  Hide Replies: Sakrij odgovor | Sakrij odgovore
   View 1 reply from {channelName}: Pogledaj 1 odgovor od {channelName}
   View {replyCount} replies from {channelName} and others: Pogledaj {replyCount} odgovora od {channelName} i drugih
 Up Next: 'Sljedeći'
diff --git a/static/locales/hu.yaml b/static/locales/hu.yaml
index c854fb0fac38f..75abd8bc0d006 100644
--- a/static/locales/hu.yaml
+++ b/static/locales/hu.yaml
@@ -928,7 +928,6 @@ Mini Player: 'Minilejátszó'
 Comments:
   Comments: 'Hozzászólások'
   Click to View Comments: 'Hozzászólások megtekintése'
-  Getting comment replies, please wait: 'Hozzászólásra adott válaszok beolvasása, várjon'
   There are no more comments for this video: 'Ehhez a videóhoz nincsenek további hozzászólások'
   Hide Comments: 'Hozzászólások elrejtése'
   # Context: View 10 Replies, View 1 Reply
diff --git a/static/locales/id.yaml b/static/locales/id.yaml
index 1cad7993a364a..56ffe64df92fe 100644
--- a/static/locales/id.yaml
+++ b/static/locales/id.yaml
@@ -913,7 +913,6 @@ Mini Player: 'Pemutar Kecil'
 Comments:
   Comments: 'Komentar'
   Click to View Comments: 'Klik untuk Melihat Komentar'
-  Getting comment replies, please wait: 'Memuat balasan komentar, harap tunggu'
   Hide Comments: 'Sembunyikan Komentar'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Tidak ada komentar tersedia untuk video ini'
diff --git a/static/locales/is.yaml b/static/locales/is.yaml
index 8b8796ed51f2c..b0edca770fa5d 100644
--- a/static/locales/is.yaml
+++ b/static/locales/is.yaml
@@ -914,7 +914,6 @@ Mini Player: 'Smáspilari'
 Comments:
   Comments: 'Athugasemdir'
   Click to View Comments: 'Smelltu til að skoða athugasemdir'
-  Getting comment replies, please wait: 'Sæki svör við athugasemdum, bíddu aðeins'
   There are no more comments for this video: 'Það eru engar fleiri athugasemdir við þetta myndskeið'
   Hide Comments: 'Fela athugasemdir'
   Top comments: 'Efstu athugasemdir'
diff --git a/static/locales/it.yaml b/static/locales/it.yaml
index 24b8d7cc18833..8c660eaa7fb8e 100644
--- a/static/locales/it.yaml
+++ b/static/locales/it.yaml
@@ -41,6 +41,7 @@ Global:
     Watching Count: 1 spettatore | {count} spettatori
     Comment Count: 1 commento | {count} commenti
     Like Count: 1 mi piace | {count} mi piace
+    Replies Remaining: "{' '}(1 rimanente) | {' '}({count} rimanenti)"
 Search / Go to URL: 'Ricerca o aggiungi URL YouTube'
   # In Filter Button
 Search Filters:
@@ -869,7 +870,6 @@ Mini Player: 'Mini visualizzatore'
 Comments:
   Comments: 'Commenti'
   Click to View Comments: 'Fai clic per vedere i commenti'
-  Getting comment replies, please wait: 'Sto scaricando le risposte ai commenti, per favore attendi'
   Hide Comments: 'Nascondi i commenti'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Non ci sono commenti disponibili per questo video'
@@ -884,7 +884,7 @@ Comments:
   View {replyCount} replies: Visualizza 1 risposta | Visualizza {replyCount} risposte
   Subscribed: Iscritto
   There are no comments available for this post: Non ci sono commenti disponibili per questo post
-  Hide {replyCount} replies: Nascondi 1 risposta | Nascondi {replyCount} risposte
+  Hide Replies: Nascondi la risposta | Nascondi le risposte
   View 1 reply from {channelName}: Visualizza 1 risposta da {channelName}
   View {replyCount} replies from {channelName} and others: Visualizza {replyCount} risposte da {channelName} e altri
 Up Next: 'Prossimi video'
diff --git a/static/locales/ja.yaml b/static/locales/ja.yaml
index ee151ff7fe063..6740e93d8a79a 100644
--- a/static/locales/ja.yaml
+++ b/static/locales/ja.yaml
@@ -36,8 +36,9 @@ Global:
     View Count: 1 回視聴 | {count} 回視聴
     Watching Count: 1 人が視聴中 | {count} 人が視聴中
     Channel Count: 1 チャンネル | {count} チャンネル
-    Comment Count: 1 コメント｜{count} コメント
-    Like Count: 1 いいね｜{count} いいね
+    Comment Count: 1 コメント | {count} コメント
+    Like Count: 1 いいね | {count} いいね
+    Replies Remaining: （残り 1 件）|（残り {count} 件）
 Search / Go to URL: '検索 / URL に移動'
   # In Filter Button
 Search Filters:
@@ -865,7 +866,6 @@ Mini Player: 'ミニプレーヤー'
 Comments:
   Comments: 'コメント'
   Click to View Comments: 'コメント表示'
-  Getting comment replies, please wait: 'コメント返信を取得中。お待ちください'
   Hide Comments: 'コメント非表示'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'この動画にはコメントがありません'
@@ -880,7 +880,7 @@ Comments:
   View {replyCount} replies: '1 件の返信を見る | {replyCount} 件の返信を見る'
   Subscribed: チャンネル登録済み
   There are no comments available for this post: この記事にコメントはありません
-  Hide {replyCount} replies: 1 件の返信を非表示にする | {replyCount} 件の返信を非表示にする
+  Hide Replies: 返信を非表示にする
   View 1 reply from {channelName}: '{channelName} からの 1 件の返信を見る'
   View {replyCount} replies from {channelName} and others: '{channelName} や他のユーザーからの {replyCount} 件の返信を見る'
 Up Next: '次の動画'
diff --git a/static/locales/ko.yaml b/static/locales/ko.yaml
index 70f87d69424dd..50c8070a47e66 100644
--- a/static/locales/ko.yaml
+++ b/static/locales/ko.yaml
@@ -36,10 +36,11 @@ Global:
     Subscriber Count: 1명 구독자 | {count}명 구독
     View Count: 1회 조회 | {count}회 조회
     Watching Count: 1명 시청 중 | {count}명 시청 중
-    Video Count: 1개 동영상 | {count} 개 동영상
+    Video Count: 1개 동영상 | {count}개 동영상
     Channel Count: 1개 채널 | {count}개 채널
     Comment Count: 1개 댓글 | {count}개 댓글
     Like Count: 1개 좋아요 | {count}개 좋아요
+    Replies Remaining: "{' '}(1개 남음) | {' '}({count}개 남음)"
 Version {versionNumber} is now available!  Click for more details: '{versionNumber} 버전이 사용가능합니다! 클릭하여 자세한 정보를 확인하세요'
 Download From Site: '사이트로부터 다운로드'
 
@@ -454,7 +455,7 @@ Channel:
   Subscribe: '구독'
   Unsubscribe: '구독 취소'
   Channel has been removed from your subscriptions: '채널이 구독에서 제거되었습니다'
-  Removed subscription from {count} other channel(s): '{count} 다른 채널에서 구독을 제거했습니다'
+  Removed subscription from {count} other channel(s): '다른 {count}개의 채널에서 구독을 제거했습니다'
   Added channel to your subscriptions: '구독에 채널을 추가했습니다'
   Search Channel: '채널 검색'
   Your search results have returned 0 results: '0 건이 검색되었습니다'
@@ -584,7 +585,6 @@ Mini Player: '미니 플레이어'
 Comments:
   Comments: '댓글'
   Click to View Comments: '댓글을 보려면 클릭하세요'
-  Getting comment replies, please wait: '댓글의 답글을 받는 중입니다. 잠시만 기다려 주세요'
   There are no more comments for this video: '이 영상에 대한 댓글이 더 이상 없습니다'
   Hide Comments: '댓글 숨기기'
   Top comments: '인기 댓글'
@@ -596,7 +596,8 @@ Comments:
   Pinned by: 고정된 댓글
   Member: 구성원
   Hearted: 좋아요 표시한
-  View {replyCount} replies: '{replyCount} 개의 답글 보기'
+  View {replyCount} replies: '{replyCount}개의 답글 보기'
+  Hide Replies: '답글 숨기기'
 Up Next: '다음 위로'
 
 #Tooltips
@@ -660,7 +661,7 @@ Channels:
   Search bar placeholder: 채널 검색
   Empty: 채널 목록이 비어 있습니다.
   Unsubscribe Prompt: '"{channelName}"에서 구독을 취소하시겠습니까?'
-  Count: '{number} 채널이 발견되었습니다.'
+  Count: '{number}개의 채널이 발견되었습니다.'
 Screenshot Error: 스크린샷이 실패했습니다. {error}
 Screenshot Success: 스크린샷을 "{filePath}"로 저장
 Clipboard:
diff --git a/static/locales/lt.yaml b/static/locales/lt.yaml
index 1203b96c5ce43..c30a023d97774 100644
--- a/static/locales/lt.yaml
+++ b/static/locales/lt.yaml
@@ -566,7 +566,6 @@ Mini Player: 'Mini grotuvas'
 Comments:
   Comments: 'Komentarai'
   Click to View Comments: 'Spustelėkite norėdami peržiūrėti komentarus'
-  Getting comment replies, please wait: 'Gaunami atsakymai į komentarus, palaukite'
   There are no more comments for this video: 'Šiame vaizdo įraše nėra daugiau komentarų'
   Hide Comments: 'Slėpti komentarus'
   Top comments: 'Top komentarai'
diff --git a/static/locales/lv.yaml b/static/locales/lv.yaml
index e740382414085..f273cf45dc4b4 100644
--- a/static/locales/lv.yaml
+++ b/static/locales/lv.yaml
@@ -775,7 +775,6 @@ Mini Player: ''
 Comments:
   Comments: 'Komentāri'
   Click to View Comments: 'Rādīt komentārus'
-  Getting comment replies, please wait: 'Notiek komentāra atbilžu ielāde, lūdzu, uzgaidiet'
   There are no more comments for this video: 'Šim video nav vairāk komentāru'
   Hide Comments: 'Paslēpt komentārus'
   Top comments: 'Populārākos augšgalā'
diff --git a/static/locales/ms.yaml b/static/locales/ms.yaml
index 1f90e7dbe7e53..33999c50037d1 100644
--- a/static/locales/ms.yaml
+++ b/static/locales/ms.yaml
@@ -950,7 +950,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/my.yaml b/static/locales/my.yaml
index 2d4918edd150a..7f7322ac66f30 100644
--- a/static/locales/my.yaml
+++ b/static/locales/my.yaml
@@ -887,7 +887,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/nb-NO.yaml b/static/locales/nb-NO.yaml
index 6187829014a16..776ea90bc1acd 100644
--- a/static/locales/nb-NO.yaml
+++ b/static/locales/nb-NO.yaml
@@ -864,7 +864,6 @@ Mini Player: 'Miniavspiller'
 Comments:
   Comments: 'Kommentarer'
   Click to View Comments: 'Klikk her for å vise kommentarer'
-  Getting comment replies, please wait: 'Henter kommentarsvar...'
   Hide Comments: 'Skjul kommentarer'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Det er ingen kommentarer tilgjengelig på denne videoen'
@@ -879,7 +878,7 @@ Comments:
   Hearted: Hjertemerket
   Subscribed: Abonnert
   There are no comments available for this post: Det er ingen kommentarer tilgjengelig på denne posten
-  Hide {replyCount} replies: Skjul 1 svar | Skjul {replyCount} svar
+  Hide Replies: Skjul svar
   View 1 reply from {channelName}: Vis 1 svar fra {channelName}
   View {replyCount} replies from {channelName} and others: Vis {replyCount} svar fra {channelName} og andre
 Up Next: 'Neste'
diff --git a/static/locales/nl.yaml b/static/locales/nl.yaml
index 2a20e8c78dadb..b527ac00e8ef9 100644
--- a/static/locales/nl.yaml
+++ b/static/locales/nl.yaml
@@ -40,6 +40,7 @@ Global:
     Channel Count: 1 kanaal | {count} kanalen
     Like Count: 1 vind ik leuk | {count} vind ik leuks
     Comment Count: 1 commentaar | {count} commentaren
+    Replies Remaining: "{' '}(1 resterend) | {' '}({count} resterend)"
   Posts: Posts
 Search / Go to URL: 'Zoeken / Ga naar URL'
   # In Filter Button
@@ -858,7 +859,6 @@ Mini Player: 'Mini­speler'
 Comments:
   Comments: 'Opmerkingen'
   Click to View Comments: 'Klik om reacties te tonen'
-  Getting comment replies, please wait: 'Reacties worden verzameld, even geduld aub'
   Hide Comments: 'Opmerkingen verbergen'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Er zijn geen reacties beschikbaar voor deze video'
@@ -873,7 +873,7 @@ Comments:
   View {replyCount} replies: '1 reactie bekijken | {replyCount} reacties bekijken'
   Subscribed: Geabonneerd
   There are no comments available for this post: Er zijn geen reacties beschikbaar voor deze post
-  Hide {replyCount} replies: 1 reactie verbergen | Verberg {replyCount} reacties
+  Hide Replies: Reacties verbergen
   View 1 reply from {channelName}: Bekijk 1 reactie van {channelName}
   View {replyCount} replies from {channelName} and others: '{replyCount} reacties van {channelName} en anderen bekijken'
 Up Next: 'Volgende'
diff --git a/static/locales/nn.yaml b/static/locales/nn.yaml
index 3c92751274dc3..f5d4479d15887 100644
--- a/static/locales/nn.yaml
+++ b/static/locales/nn.yaml
@@ -558,7 +558,6 @@ Mini Player: 'Miniavspelar'
 Comments:
   Comments: 'Kommentarar'
   Click to View Comments: 'Klikk her for å vise kommentarar'
-  Getting comment replies, please wait: 'Laster inn kommentarar. Ver venleg og vent'
   There are no more comments for this video: 'Det finst ingen fleire kommentarar for denne videoen'
   Hide Comments: 'Skjul kommentarar'
   Top comments: 'Toppkommentarar'
@@ -571,6 +570,7 @@ Comments:
   Member: Medlem
   Hearted: Likt
   View {replyCount} replies: Vis {replyCount} svar
+  Hide Replies: Skjul svar
 Up Next: 'Neste'
 
 #Tooltips
diff --git a/static/locales/pl.yaml b/static/locales/pl.yaml
index 6ac6e936cc7c8..cafda65c87b7f 100644
--- a/static/locales/pl.yaml
+++ b/static/locales/pl.yaml
@@ -869,7 +869,6 @@ Mini Player: 'Mini odtwarzacz'
 Comments:
   Comments: 'Komentarze'
   Click to View Comments: 'Kliknij, aby zobaczyć komentarze'
-  Getting comment replies, please wait: 'Pobieranie odpowiedzi do komentarza, proszę poczekać'
   Hide Comments: 'Schowaj komentarze'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Nie ma żadnych komentarzy odnośnie tego filmu'
@@ -884,7 +883,7 @@ Comments:
   View {replyCount} replies: Zobacz 1 odpowiedź | Zobacz {replyCount} odpowiedzi
   Subscribed: Zasubskrybowano
   There are no comments available for this post: Nie ma żadnych komentarzy pod tym wpisem
-  Hide {replyCount} replies: Ukryj 1 odpowiedź | Ukryj {replyCount} odpowiedzi
+  Hide Replies: Ukryj odpowiedź | Ukryj odpowiedzi
   View 1 reply from {channelName}: Zobacz 1 odpowiedź od {channelName}
   View {replyCount} replies from {channelName} and others: Zobacz {replyCount} odpowiedzi od {channelName} i innych
 Up Next: 'Następne'
diff --git a/static/locales/pt-BR.yaml b/static/locales/pt-BR.yaml
index e2a808f1fea8a..ad040fe02442f 100644
--- a/static/locales/pt-BR.yaml
+++ b/static/locales/pt-BR.yaml
@@ -864,7 +864,6 @@ Mini Player: 'Mini Player'
 Comments:
   Comments: 'Comentários'
   Click to View Comments: 'Mostrar comentários'
-  Getting comment replies, please wait: 'Buscando respostas, por favor, aguarde'
   Hide Comments: 'Ocultar comentários'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Não há comentários disponíveis neste vídeo'
@@ -879,7 +878,7 @@ Comments:
   View {replyCount} replies: Mostrar 1 resposta | Mostrar {replyCount} respostas
   Subscribed: Inscrito
   There are no comments available for this post: Não há comentários disponíveis para esta postagem
-  Hide {replyCount} replies: Ocultar 1 resposta | Ocultar {replyCount} respostas
+  Hide Replies: Ocultar resposta | Ocultar respostas
   View 1 reply from {channelName}: Mostrar 1 resposta de {channelName}
   View {replyCount} replies from {channelName} and others: Mostrar {replyCount} respostas de {channelName} e outros
 Up Next: 'Próximo'
diff --git a/static/locales/pt-PT.yaml b/static/locales/pt-PT.yaml
index 3a8351956c536..da17b7bd98b8d 100644
--- a/static/locales/pt-PT.yaml
+++ b/static/locales/pt-PT.yaml
@@ -911,7 +911,6 @@ Mini Player: Mini-reprodutor
 Comments:
   Comments: Comentários
   Click to View Comments: Clicar para ver os comentários
-  Getting comment replies, please wait: A obter respostas ao comentário, por favor aguarde
   There are no more comments for this video: Não há mais comentários para este vídeo
   Hide Comments: Ocultar comentários
   Top comments: Melhores comentários
@@ -926,7 +925,7 @@ Comments:
   Hearted: Favorito
   Subscribed: Subscrito
   There are no comments available for this post: Não existem comentários para esta publicação
-  Hide {replyCount} replies: Esconder 1 resposta | Esconder {replyCount} respostas
+  Hide Replies: Esconder resposta | Esconder respostas
   View 1 reply from {channelName}: Ver 1 resposta de {channelName}
   View {replyCount} replies from {channelName} and others: Ver {replyCount} respostas de {channelName} e outros
 Up Next: Próximo
diff --git a/static/locales/pt.yaml b/static/locales/pt.yaml
index cc839fc0d2299..d87147e8ac6ed 100644
--- a/static/locales/pt.yaml
+++ b/static/locales/pt.yaml
@@ -908,7 +908,6 @@ Mini Player: 'Mini-reprodutor'
 Comments:
   Comments: 'Comentários'
   Click to View Comments: 'Clicar para ver os comentários'
-  Getting comment replies, please wait: 'A obter respostas ao comentário, por favor aguarde'
   Hide Comments: 'Ocultar comentários'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Este vídeo não tem comentários'
@@ -923,7 +922,7 @@ Comments:
   View {replyCount} replies: Ver 1 resposta | Ver {replyCount} respostas
   Subscribed: Subscrito
   There are no comments available for this post: Não existem comentários para esta publicação
-  Hide {replyCount} replies: Ocultar 1 resposta | Ocultar {replyCount} respostas
+  Hide Replies: Ocultar resposta | Ocultar respostas
   View 1 reply from {channelName}: Ver 1 resposta de {channelName}
   View {replyCount} replies from {channelName} and others: Veja {replyCount} respostas de {channelName} e outros
 Up Next: 'Próximo'
diff --git a/static/locales/ro.yaml b/static/locales/ro.yaml
index 1a3b8c1a59e3d..2ecdb6ee1fc58 100644
--- a/static/locales/ro.yaml
+++ b/static/locales/ro.yaml
@@ -885,7 +885,6 @@ Mini Player: 'Mini Player'
 Comments:
   Comments: 'Comentarii'
   Click to View Comments: 'Faceți clic pentru a vedea comentariile'
-  Getting comment replies, please wait: 'Se obțin răspunsurile comentariului, vă rugăm să așteptați'
   There are no more comments for this video: 'Nu mai există niciun comentariu pentru acest videoclip'
   Hide Comments: 'Ascundeți comentariile'
   # Context: View 10 Replies, View 1 Reply
diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
index 5153b2064050b..3458794b8196e 100644
--- a/static/locales/ru.yaml
+++ b/static/locales/ru.yaml
@@ -866,7 +866,6 @@ Mini Player: 'Мини-проигрыватель'
 Comments:
   Comments: 'Комментарии'
   Click to View Comments: 'Нажмите, чтобы просмотреть комментарии'
-  Getting comment replies, please wait: 'Получение ответов на комментарии, пожалуйста, подождите'
   Hide Comments: 'Скрыть комментарии'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'К этому видео нет комментариев'
@@ -881,7 +880,7 @@ Comments:
   Hearted: С сердечком
   Subscribed: Подписан(а)
   There are no comments available for this post: Для этой записи нет доступных комментариев
-  Hide {replyCount} replies: Скрыть 1 ответ | Скрыть {replyCount} ответа(ов)
+  Hide Replies: Скрыть ответ | Скрыть ответы
   View 1 reply from {channelName}: Смотреть 1 ответ от {channelName}
   View {replyCount} replies from {channelName} and others: Смотреть {replyCount} ответа(ов) от {channelName} и других
 Up Next: 'Следующий'
diff --git a/static/locales/sk.yaml b/static/locales/sk.yaml
index f55f3b93a009a..4c286ee30543a 100644
--- a/static/locales/sk.yaml
+++ b/static/locales/sk.yaml
@@ -863,7 +863,6 @@ Mini Player: 'Mini prehrávač'
 Comments:
   Comments: 'Komentáre'
   Click to View Comments: 'Kliknutím zobrazíte komentáre'
-  Getting comment replies, please wait: 'Získavanie odpovedí na komentáre, čakajte prosím'
   Hide Comments: 'Skryť komentáre'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Pre toto video nie sú dostupné žiadne komentáre'
@@ -879,7 +878,7 @@ Comments:
   There are no comments available for this post: Pre tento príspevok nie sú dostupné žiadne komentáre
   View {replyCount} replies from {channelName} and others: Zobraziť {replyCount} odpovedí od {channelName} a ostatných
   View 1 reply from {channelName}: Zobraziť 1 odpoveď od {channelName}
-  Hide {replyCount} replies: Skryť 1 odpoveď | Skryť odpovede v počte {replyCount}
+  Hide Replies: Skryť odpoveď | Skryť odpovede
   View {replyCount} replies: Zobraziť 1 odpoveď | Zobraziť {replyCount} odpovedí
 Up Next: 'Ďalšie'
 
diff --git a/static/locales/sl.yaml b/static/locales/sl.yaml
index 02f3c906bd8f9..f7b3d9a7872bd 100644
--- a/static/locales/sl.yaml
+++ b/static/locales/sl.yaml
@@ -27,6 +27,7 @@ Forward: 'Naprej'
 # Anything shared among components / views should be put here
 Global:
   Videos: 'Videoposnetki'
+
   Sort By: 'Razvrstitev'
 
   Live: V živo
@@ -476,7 +477,6 @@ Mini Player: 'Mini predvajalnik'
 Comments:
   Comments: 'Komentarji'
   Click to View Comments: 'Kliknite za prikaz komentarjev'
-  Getting comment replies, please wait: 'Pridobivanje odgovorov na komentar. Prosimo, počakajte'
   There are no more comments for this video: 'Za ta posnetek ni več komentarjev'
   Hide Comments: 'Skrij komentarje'
   # Context: View 10 Replies, View 1 Reply
@@ -486,6 +486,7 @@ Comments:
   Top comments: Najbolje ocenjeni komentarji
   Show More Replies: Pokaži več odgovorov
   Member: Član
+  Hide Replies: Skrij odgovor | Skrij odgovore
 Up Next: 'Naslednje na sporedu'
 
 # Toast Messages
diff --git a/static/locales/sm.yaml b/static/locales/sm.yaml
index a51d0a459cc5a..e0a115cc21cda 100644
--- a/static/locales/sm.yaml
+++ b/static/locales/sm.yaml
@@ -632,7 +632,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/sq.yaml b/static/locales/sq.yaml
index 2d89c957cc99d..25d948ad74c7d 100644
--- a/static/locales/sq.yaml
+++ b/static/locales/sq.yaml
@@ -938,7 +938,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/sr.yaml b/static/locales/sr.yaml
index cebcaf4f6b3c5..8da15413c3f0d 100644
--- a/static/locales/sr.yaml
+++ b/static/locales/sr.yaml
@@ -906,7 +906,6 @@ Comments:
   Click to View Comments: Кликни да видиш коментаре
   Top comments: Топ коментари
   Subscribed: Пратите
-  Getting comment replies, please wait: Набављање одговора на коментаре, сачекајте
   Load More Comments: Учитај више коментара
   Hide Comments: Сакриј коментаре
   Show More Replies: Прикажи више одговора
@@ -918,6 +917,7 @@ Comments:
   There are no more comments for this video: Нема више коментара за овај видео снимак
   Newest first: Најновије прво
   There are no comments available for this post: Нема доступних коментара за ову објаву
+  Hide Replies: Сакриј одговор | Сакриј одговоре
 Share:
   Invidious Embed URL copied to clipboard: Invidious уграђени URL је копиран у привремену меморију
   Share Channel: Дели канал
diff --git a/static/locales/sv.yaml b/static/locales/sv.yaml
index 1ba83151941b8..6a5a0d83d0cd1 100644
--- a/static/locales/sv.yaml
+++ b/static/locales/sv.yaml
@@ -40,6 +40,7 @@ Global:
     Channel Count: 1 kanal | {count} kanaler
     Like Count: 1 gillning | {count} gillningar
     Comment Count: 1 kommentar | {count} kommentarer
+    Replies Remaining: "{' '}(1 kvar) | {' '}({count} kvar)"
 Version {versionNumber} is now available!  Click for more details: 'Version {versionNumber} är nu tillgänglig!  Klicka för mer information'
 Download From Site: 'Ladda ner från webbplats'
 
@@ -913,7 +914,6 @@ Mini Player: 'Minispelare'
 Comments:
   Comments: 'Kommentarer'
   Click to View Comments: 'Klicka för att visa kommentarer'
-  Getting comment replies, please wait: 'Hämtar svar på kommentarer, vänta'
   There are no more comments for this video: 'Det finns inga fler kommentarer för videon'
   Hide Comments: 'Dölj kommentarer'
   # Context: View 10 Replies, View 1 Reply
@@ -928,7 +928,7 @@ Comments:
   Hearted: Hjärtmarkerade
   Subscribed: Prenumererar
   There are no comments available for this post: Det finns inga kommentarer tillgängliga för detta inlägg
-  Hide {replyCount} replies: Dölj 1 svar | Dölj {replyCount} svar
+  Hide Replies: Dölj svar
   View 1 reply from {channelName}: Visa 1 svar från {channelName}
   View {replyCount} replies from {channelName} and others: Visa {replyCount} svar från {channelName} och andra
 Up Next: 'Kommer härnäst'
diff --git a/static/locales/ta.yaml b/static/locales/ta.yaml
index 7ac6bca72dd20..f0e92bb636824 100644
--- a/static/locales/ta.yaml
+++ b/static/locales/ta.yaml
@@ -1000,7 +1000,6 @@ Mini Player: 'மினி பிளேயர்'
 Comments:
   Comments: 'கருத்துகள்'
   Click to View Comments: 'கருத்துகளைக் காண சொடுக்கு செய்க'
-  Getting comment replies, please wait: 'கருத்து பதில்களைப் பெறுதல், தயவுசெய்து காத்திருங்கள்'
   There are no more comments for this video: 'இந்த வீடியோவுக்கு இனி கருத்துகள் இல்லை'
   Hide Comments: 'கருத்துகளை மறைக்கவும்'
   Top comments: 'சிறந்த கருத்துகள்'
diff --git a/static/locales/th.yaml b/static/locales/th.yaml
index 29f6deb0217ec..aa99b99b84052 100644
--- a/static/locales/th.yaml
+++ b/static/locales/th.yaml
@@ -965,7 +965,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/tr.yaml b/static/locales/tr.yaml
index bd1aeed15f9fb..500a24a5e4135 100644
--- a/static/locales/tr.yaml
+++ b/static/locales/tr.yaml
@@ -916,7 +916,6 @@ Mini Player: 'Mini Oynatıcı'
 Comments:
   Comments: 'Yorumlar'
   Click to View Comments: 'Yorumları Görüntülemek İçin Tıklayın'
-  Getting comment replies, please wait: 'Yorum yanıtları yükleniyor, lütfen bekleyin'
   There are no more comments for this video: 'Bu video için daha fazla yorum yok'
   Hide Comments: 'Yorumları Gizle'
   # Context: View 10 Replies, View 1 Reply
diff --git a/static/locales/uk.yaml b/static/locales/uk.yaml
index f0290edee306a..6924dde30adb6 100644
--- a/static/locales/uk.yaml
+++ b/static/locales/uk.yaml
@@ -911,7 +911,6 @@ Mini Player: 'Мініпрогравач'
 Comments:
   Comments: 'Коментарі'
   Click to View Comments: 'Клацніть, щоб переглянути коментарі'
-  Getting comment replies, please wait: 'Отримання відповідей на коментарі, зачекайте'
   There are no more comments for this video: 'Більше немає коментарів до цього відео'
   Hide Comments: 'Приховати коментарі'
   Top comments: 'Найпопулярніші коментарі'
@@ -926,7 +925,7 @@ Comments:
   View {replyCount} replies: Переглянути 1 відповідь | Переглянути {replyCount} відповідей
   Subscribed: Слідкують
   There are no comments available for this post: Коментарі для цього поста відсутні
-  Hide {replyCount} replies: Приховати 1 відповідь | Приховати {replyCount} відповідей
+  Hide Replies: Приховати відповідь | Приховати відповіді
   View 1 reply from {channelName}: Переглянути 1 відповідь від {channelName}
   View {replyCount} replies from {channelName} and others: Переглянути {replyCount} відповідей від {channelName} та інших
 Up Next: 'Далі'
diff --git a/static/locales/ur.yaml b/static/locales/ur.yaml
index 8cb8564ef931a..57bbe0b6ad7af 100644
--- a/static/locales/ur.yaml
+++ b/static/locales/ur.yaml
@@ -1022,7 +1022,6 @@ Mini Player: منی پلیئر
 Comments:
   Comments: کمنٹس
   Click to View Comments: کمنٹس دیکھنے کے لیے کلک کریں
-  Getting comment replies, please wait: کمنٹس کے جوابات حاصل کیے جا رہے ہیں، براہ کرم انتظار کریں
   There are no more comments for this video: اس ویڈیو کے لیے مزید کوئی کمنٹس نہیں ہیں
   Hide Comments: کمنٹس چھپائیں
   Top comments: بہترین کمنٹس
diff --git a/static/locales/uz.yaml b/static/locales/uz.yaml
index 0f5228104454a..81008151b32ed 100644
--- a/static/locales/uz.yaml
+++ b/static/locales/uz.yaml
@@ -950,7 +950,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/vi.yaml b/static/locales/vi.yaml
index e99c1102550b4..9bb1846fdeb0a 100644
--- a/static/locales/vi.yaml
+++ b/static/locales/vi.yaml
@@ -868,7 +868,6 @@ Mini Player: 'Trình phát Mini'
 Comments:
   Comments: 'Bình luận'
   Click to View Comments: 'Nhấn để xem bình luận'
-  Getting comment replies, please wait: 'Đang lấy trả lời bình luận, vui lòng chờ'
   Hide Comments: 'Ẩn bình luận'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: 'Không có bình luận nào cho video này'
diff --git a/static/locales/vls.yaml b/static/locales/vls.yaml
index 38fd115035871..198b528624fad 100644
--- a/static/locales/vls.yaml
+++ b/static/locales/vls.yaml
@@ -829,7 +829,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/xh.yaml b/static/locales/xh.yaml
index 98f6794c93072..6e401744641b4 100644
--- a/static/locales/xh.yaml
+++ b/static/locales/xh.yaml
@@ -957,7 +957,6 @@ Mini Player: ''
 Comments:
   Comments: ''
   Click to View Comments: ''
-  Getting comment replies, please wait: ''
   There are no more comments for this video: ''
   Hide Comments: ''
   Top comments: ''
diff --git a/static/locales/zh-CN.yaml b/static/locales/zh-CN.yaml
index 52764602db057..f8b93f154c5de 100644
--- a/static/locales/zh-CN.yaml
+++ b/static/locales/zh-CN.yaml
@@ -38,6 +38,7 @@ Global:
     Watching Count: 1 人正在观看 | {count} 人正在观看
     Like Count: 1 个赞 | {count} 个赞
     Comment Count: 1 条评论 | {count} 条评论
+    Replies Remaining: （还有 1 条）|（还有 {count} 条）
 Search / Go to URL: '搜索 / 前往URL'
   # In Filter Button
 Search Filters:
@@ -869,7 +870,6 @@ Mini Player: '迷你播放器'
 Comments:
   Comments: '评论'
   Click to View Comments: '点击观看评论'
-  Getting comment replies, please wait: '获取评论中，请稍候'
   Hide Comments: '隐藏评论'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: '这个视频没有评论'
@@ -884,7 +884,7 @@ Comments:
   View {replyCount} replies: 查看 1 条回复|查看 {replyCount} 条回复
   Subscribed: 已订阅
   There are no comments available for this post: 此帖子没有评论
-  Hide {replyCount} replies: 隐藏 1 条回复| 隐藏 {replyCount} 条回复
+  Hide Replies: 隐藏回复
   View 1 reply from {channelName}: 查看 1 条来自 {channelName}的回复
   View {replyCount} replies from {channelName} and others: 查看 {replyCount} 条来自 {channelName} 和其他频道的回复
 Up Next: 'Up Next'
diff --git a/static/locales/zh-TW.yaml b/static/locales/zh-TW.yaml
index 7296dccadc986..ac543a1ead202 100644
--- a/static/locales/zh-TW.yaml
+++ b/static/locales/zh-TW.yaml
@@ -38,6 +38,7 @@ Global:
     Watching Count: 1 個正在觀看 | {count} 個正在觀看
     Comment Count: 1 則留言 | {count} 則留言
     Like Count: 1 個喜歡 | {count} 個喜歡
+    Replies Remaining: （還有 1 則）|（還有 {count} 則）
 Search / Go to URL: '搜尋/ 前往網址'
   # In Filter Button
 Search Filters:
@@ -869,7 +870,6 @@ Mini Player: '迷你播放器'
 Comments:
   Comments: '留言'
   Click to View Comments: '點擊查看留言'
-  Getting comment replies, please wait: '正在取得留言回覆，請稍候'
   Hide Comments: '隱藏留言'
   # Context: View 10 Replies, View 1 Reply
   There are no comments available for this video: '這個影片沒有留言'
@@ -884,7 +884,7 @@ Comments:
   Hearted: 喜歡的
   Subscribed: 已訂閱
   There are no comments available for this post: 此貼文尚無留言
-  Hide {replyCount} replies: 隱藏 1 則回覆 | 隱藏 {replyCount} 則回覆
+  Hide Replies: 隱藏回覆
   View 1 reply from {channelName}: 檢視來自 {channelName} 的 1 則回覆
   View {replyCount} replies from {channelName} and others: 檢視來自 {channelName} 與其他頻道的 {replyCount} 則回覆
 Up Next: '觀看其他類似影片'