diff --git a/docs/diagrams/FavActivityDiagram.puml b/docs/diagrams/FavActivityDiagram.puml
index 6639206ecc6..6038a62ba30 100644
--- a/docs/diagrams/FavActivityDiagram.puml
+++ b/docs/diagrams/FavActivityDiagram.puml
@@ -2,6 +2,8 @@
 skin rose
 skinparam ActivityFontSize 15
 skinparam ArrowFontSize 12
+skinparam DefaultTextAlignment center
+
 start
 :User executes fav command;
 
@@ -10,14 +12,14 @@ start
 
 if () then ([index is valid])
     if () then ([Person is favourite])
-        :Create new Person with same values but is a favourite;
-        :Replace the original Person with the new one;
+        :Create new Person with same\n values but is a favourite;
+        :Replace the original Person\n with the new one;
         :Refresh the list of Persons;
     else ([else])
-        :Show error message to user that person is already a favourite;
+        :Show error message to user\n that person is already a favourite;
     endif
 else ([else])
-    :Show error message to user that index is invalid;
+    :Show error message to user\n that index is invalid;
 endif
 stop
 @enduml
diff --git a/docs/diagrams/UnfavActivityDiagram.puml b/docs/diagrams/UnfavActivityDiagram.puml
index 5ea7049ad97..8ccfd7c3f07 100644
--- a/docs/diagrams/UnfavActivityDiagram.puml
+++ b/docs/diagrams/UnfavActivityDiagram.puml
@@ -2,6 +2,8 @@
 skin rose
 skinparam ActivityFontSize 15
 skinparam ArrowFontSize 12
+skinparam DefaultTextAlignment center
+
 start
 :User executes unfav command;
 
@@ -10,14 +12,14 @@ start
 
 if () then ([index is valid])
     if () then ([Person is favourite])
-        :Create new Person with same values but is not a favourite;
-        :Replace the original Person with the new one;
+        :Create new Person with same\n values but is not a favourite;
+        :Replace the original Person\n with the new one;
         :Refresh the list of Persons;
     else ([else])
-        :Show error message to user that person is already not a favourite;
+        :Show error message to user\n that person is already not a favourite;
     endif
 else ([else])
-    :Show error message to user that index is invalid;
+    :Show error message to user\n that index is invalid;
 endif
 stop
 @enduml
diff --git a/docs/images/FavActivityDiagram.png b/docs/images/FavActivityDiagram.png
index 0e31b079903..b55487b8fe4 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 cf546759ff8..50529106e46 100644
Binary files a/docs/images/UnfavActivityDiagram.png and b/docs/images/UnfavActivityDiagram.png differ