diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 28de46839e532382f486ef32f0646a69d7e1ff1f..b54fd25f301634e1d19b70ab15c49173dc8642da 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -272,6 +272,8 @@
                [parseVote]="getVote(current)"
                [userRole]="userRole"
                [moderator]="false"
+               [isFromModerator]="moderatorIds.includes(current.creatorId)"
+               [isFromOwner]="room.ownerId === current.creatorId"
                [user]="user"
                [disabled]="!commentsEnabled"
                [commentsWrittenByUser]="commentsWrittenByUsers.get(current.creatorId).size"
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index b2ed57a850f5ed57217cf667f764a4b9b86c8cec..dbb3d0ca8580b75234fbdb3b37077d0add9fc1f6 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -8,7 +8,9 @@
           'border-wrong': comment.correct === 2,
           'border-answer': comment.answer && comment.bookmark === false && comment.favorite === false,
           'border-bookmark': comment.bookmark === true,
-          'border-favorite': comment.favorite === true
+          'border-favorite': comment.favorite === true,
+          'border-fromModerator': isFromModerator,
+          'border-fromOwner': isFromOwner
           }"
           [@slide]="slideAnimationState"
           (@slide.done)="changeSlideState()">
diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index 461458aabf39d5a1d55e2bb63f95aa550fafa895..7af05a1c148a7dba8b7a55c446fec7a28df6509b 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -180,6 +180,14 @@ mat-card-content > :first-child {
   &-mergeSelect {
     @include card-box-shadow(var(--cyan));
   }
+
+  &-fromModerator {
+    @include card-box-shadow(var(--red));
+  }
+
+  &-fromOwner {
+    @include card-box-shadow(var(--red));
+  }
 }
 
 .comment-tags {
diff --git a/src/app/components/shared/comment/comment.component.ts b/src/app/components/shared/comment/comment.component.ts
index a06e38bb95b2fc856121e36dd22a95524ec298a1..59cde5fef9d46115cb1b055a1b66ced72f2b8335 100644
--- a/src/app/components/shared/comment/comment.component.ts
+++ b/src/app/components/shared/comment/comment.component.ts
@@ -45,6 +45,8 @@ export class CommentComponent implements OnInit, AfterViewInit {
   @Input() disabled = false;
   @Input() usesJoyride = false;
   @Input() commentsWrittenByUser = 1;
+  @Input() isFromModerator = false;
+  @Input() isFromOwner = false;
   @Output() clickedOnTag = new EventEmitter<string>();
   @Output() clickedOnKeyword = new EventEmitter<string>();
   @Output() clickedUserNumber = new EventEmitter<number>();