diff --git a/docs/diagrams/FavActivityDiagram.puml b/docs/diagrams/FavActivityDiagram.puml
index e9d19b35a09..6639206ecc6 100644
--- a/docs/diagrams/FavActivityDiagram.puml
+++ b/docs/diagrams/FavActivityDiagram.puml
@@ -9,15 +9,15 @@ start
 'diamond we place it as the true branch instead.
 
 if () then ([index is valid])
-    if () then ([Person has favourite as false])
-        :Construct a new Person object with favourite as true;
+    if () then ([Person is favourite])
+        :Create new Person with same values but is a favourite;
         :Replace the original Person with the new one;
-        :Refresh the list of Person;
+        :Refresh the list of Persons;
     else ([else])
-        :Throws CommandException that Person has favourite as true;
+        :Show error message to user that person is already a favourite;
     endif
 else ([else])
-    :Throw CommandException that index is is invalid;
+    :Show error message to user that index is invalid;
 endif
 stop
 @enduml
diff --git a/docs/diagrams/UnfavActivityDiagram.puml b/docs/diagrams/UnfavActivityDiagram.puml
index 7f0508ce766..5ea7049ad97 100644
--- a/docs/diagrams/UnfavActivityDiagram.puml
+++ b/docs/diagrams/UnfavActivityDiagram.puml
@@ -9,15 +9,15 @@ start
 'diamond we place it as the true branch instead.
 
 if () then ([index is valid])
-    if () then ([Person has favourite as true])
-        :Construct a new Person object with favourite as false;
+    if () then ([Person is favourite])
+        :Create new Person with same values but is not a favourite;
         :Replace the original Person with the new one;
-        :Refresh the list of Person;
+        :Refresh the list of Persons;
     else ([else])
-        :Throws CommandException that Person has favourite as false;
+        :Show error message to user that person is already not a favourite;
     endif
 else ([else])
-    :Throw CommandException that index is is invalid;
+    :Show error message to user that index is invalid;
 endif
 stop
 @enduml
diff --git a/docs/images/FavActivityDiagram.png b/docs/images/FavActivityDiagram.png
index 3d6e35ba046..0e31b079903 100644
Binary files a/docs/images/FavActivityDiagram.png and b/docs/images/FavActivityDiagram.png differ
diff --git a/docs/images/UnfavActivityDiagram.png b/docs/images/UnfavActivityDiagram.png
index 9db1d3db67b..cf546759ff8 100644
Binary files a/docs/images/UnfavActivityDiagram.png and b/docs/images/UnfavActivityDiagram.png differ