diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx
index 83477864..fae636e9 100644
--- a/src/shared/components/comment/comment-node.tsx
+++ b/src/shared/components/comment/comment-node.tsx
@@ -240,23 +240,23 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
               {cv.comment.distinguished && (
                 <Icon icon="shield" inline classes={`text-danger mr-2`} />
               )}
-              {isMod_ && (
-                <div className="badge badge-light d-none d-sm-inline mr-2">
-                  {i18n.t("mod")}
-                </div>
-              )}
-              {isAdmin_ && (
-                <div className="badge badge-light d-none d-sm-inline mr-2">
-                  {i18n.t("admin")}
-                </div>
-              )}
               {this.isPostCreator && (
                 <div className="badge badge-light d-none d-sm-inline mr-2">
                   {i18n.t("creator")}
                 </div>
               )}
+              {isMod_ && (
+                <div className="badge badge-muted d-none d-sm-inline mr-2">
+                  {i18n.t("mod")}
+                </div>
+              )}
+              {isAdmin_ && (
+                <div className="badge badge-muted d-none d-sm-inline mr-2">
+                  {i18n.t("admin")}
+                </div>
+              )}
               {cv.creator.bot_account && (
-                <div className="badge badge-light d-none d-sm-inline mr-2">
+                <div className="badge badge-muted d-none d-sm-inline mr-2">
                   {i18n.t("bot_account").toLowerCase()}
                 </div>
               )}
@@ -283,8 +283,8 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
                 )}
               </button>
               {this.linkBtn(true)}
-              {cv.comment.language_id != 0 && (
-                <span className="">
+              {cv.comment.language_id !== 0 && (
+                <span className="badge badge-muted d-none d-sm-inline mr-2">
                   {
                     this.props.allLanguages.find(
                       lang => lang.id === cv.comment.language_id
diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx
index 916c8c93..137ded9e 100644
--- a/src/shared/components/post/post-listing.tsx
+++ b/src/shared/components/post/post-listing.tsx
@@ -327,13 +327,13 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
           <PersonListing person={post_view.creator} />
 
           {this.creatorIsMod_ && (
-            <span className="mx-1 badge badge-light">{i18n.t("mod")}</span>
+            <span className="mx-1 badge badge-muted">{i18n.t("mod")}</span>
           )}
           {this.creatorIsAdmin_ && (
-            <span className="mx-1 badge badge-light">{i18n.t("admin")}</span>
+            <span className="mx-1 badge badge-muted">{i18n.t("admin")}</span>
           )}
           {post_view.creator.bot_account && (
-            <span className="mx-1 badge badge-light">
+            <span className="mx-1 badge badge-muted">
               {i18n.t("bot_account").toLowerCase()}
             </span>
           )}
@@ -344,8 +344,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
             </span>
           )}
         </li>
-        {post_view.post.language_id != 0 && (
-          <span className="list-inline-item">
+        {post_view.post.language_id !== 0 && (
+          <span className="mx-1 badge badge-muted">
             {
               this.props.allLanguages.find(
                 lang => lang.id === post_view.post.language_id