diff --git a/src/main/java/envoy/client/data/Chat.java b/src/main/java/envoy/client/data/Chat.java
index 022904c..7ca11ce 100644
--- a/src/main/java/envoy/client/data/Chat.java
+++ b/src/main/java/envoy/client/data/Chat.java
@@ -12,9 +12,9 @@ import envoy.data.Message.MessageStatus;
 import envoy.event.MessageStatusChange;
 
 /**
- * Represents a chat between two {@link User}s <br>
+ * Represents a chat between two {@link User}s
  * as a list of {@link Message} objects.
- * <br>
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Chat.java</strong><br>
  * Created: <strong>19 Oct 2019</strong><br>
@@ -32,7 +32,7 @@ public final class Chat implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * Provides the list of messages that the recipient receives.<br>
+	 * Provides the list of messages that the recipient receives.<p>
 	 * Saves the Messages in the corresponding chat at that Point.
 	 *
 	 * @param recipient the user who receives the messages
diff --git a/src/main/java/envoy/client/data/ClientConfig.java b/src/main/java/envoy/client/data/ClientConfig.java
index cde6b9a..a30dffb 100644
--- a/src/main/java/envoy/client/data/ClientConfig.java
+++ b/src/main/java/envoy/client/data/ClientConfig.java
@@ -11,8 +11,8 @@ import envoy.data.LoginCredentials;
 
 /**
  * Implements a configuration specific to the Envoy Client with default values
- * and convenience methods.<br>
- * <br>
+ * and convenience methods.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>ClientConfig.java</strong><br>
  * Created: <strong>01.03.2020</strong><br>
diff --git a/src/main/java/envoy/client/data/LocalDB.java b/src/main/java/envoy/client/data/LocalDB.java
index 66407fc..d8993f5 100644
--- a/src/main/java/envoy/client/data/LocalDB.java
+++ b/src/main/java/envoy/client/data/LocalDB.java
@@ -9,8 +9,8 @@ import envoy.event.NameChange;
 
 /**
  * Stores information about the current {@link User} and their {@link Chat}s.
- * For message ID generation a {@link IDGenerator} is stored as well.<br>
- * <br>
+ * For message ID generation a {@link IDGenerator} is stored as well.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>LocalDB.java</strong><br>
  * Created: <strong>3 Feb 2020</strong><br>
diff --git a/src/main/java/envoy/client/data/PersistentLocalDB.java b/src/main/java/envoy/client/data/PersistentLocalDB.java
index 5e13dd4..cc6cad9 100644
--- a/src/main/java/envoy/client/data/PersistentLocalDB.java
+++ b/src/main/java/envoy/client/data/PersistentLocalDB.java
@@ -11,8 +11,8 @@ import envoy.util.SerializationUtils;
 
 /**
  * Implements a {@link LocalDB} in a way that stores all information inside a
- * folder on the local file system.<br>
- * <br>
+ * folder on the local file system.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>PersistentLocalDB.java</strong><br>
  * Created: <strong>27.10.2019</strong><br>
diff --git a/src/main/java/envoy/client/data/Settings.java b/src/main/java/envoy/client/data/Settings.java
index c8bed6a..9d43bca 100644
--- a/src/main/java/envoy/client/data/Settings.java
+++ b/src/main/java/envoy/client/data/Settings.java
@@ -11,8 +11,8 @@ import envoy.util.SerializationUtils;
 /**
  * Manages all application settings, which are different objects that can be
  * changed during runtime and serialized them by using either the file system or
- * the {@link Preferences} API.<br>
- * <br>
+ * the {@link Preferences} API.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Settings.java</strong><br>
  * Created: <strong>11 Nov 2019</strong><br>
diff --git a/src/main/java/envoy/client/data/SettingsItem.java b/src/main/java/envoy/client/data/SettingsItem.java
index 8638c05..d74e222 100644
--- a/src/main/java/envoy/client/data/SettingsItem.java
+++ b/src/main/java/envoy/client/data/SettingsItem.java
@@ -7,8 +7,8 @@ import javax.swing.JComponent;
 
 /**
  * Encapsulates a persistent value that is directly or indirectly mutable by the
- * user.<br>
- * <br>
+ * user.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>SettingsItem.java</strong><br>
  * Created: <strong>23.12.2019</strong><br>
diff --git a/src/main/java/envoy/client/data/TransientLocalDB.java b/src/main/java/envoy/client/data/TransientLocalDB.java
index ef592fb..5c7d2a6 100644
--- a/src/main/java/envoy/client/data/TransientLocalDB.java
+++ b/src/main/java/envoy/client/data/TransientLocalDB.java
@@ -2,8 +2,8 @@ package envoy.client.data;
 
 /**
  * Implements a {@link LocalDB} in a way that does not persist any information
- * after application shutdown.<br>
- * <br>
+ * after application shutdown.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>TransientLocalDB.java</strong><br>
  * Created: <strong>3 Feb 2020</strong><br>
diff --git a/src/main/java/envoy/client/event/SendEvent.java b/src/main/java/envoy/client/event/SendEvent.java
index e3c9f97..8ea650b 100644
--- a/src/main/java/envoy/client/event/SendEvent.java
+++ b/src/main/java/envoy/client/event/SendEvent.java
@@ -8,7 +8,6 @@ import envoy.event.Event;
  * Created: <strong>11.02.2020</strong><br>
  *
  * @author: Maximilian K&aumlfer
- *
  * @since Envoy Client v0.3-alpha
  */
 public class SendEvent extends Event<Event<?>> {
diff --git a/src/main/java/envoy/client/net/Client.java b/src/main/java/envoy/client/net/Client.java
index 34384ec..5cf432a 100644
--- a/src/main/java/envoy/client/net/Client.java
+++ b/src/main/java/envoy/client/net/Client.java
@@ -20,8 +20,8 @@ import envoy.util.SerializationUtils;
 
 /**
  * Establishes a connection to the server, performs a handshake and delivers
- * certain objects to the server.<br>
- * <br>
+ * certain objects to the server.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>Client.java</strong><br>
  * Created: <strong>28 Sep 2019</strong><br>
diff --git a/src/main/java/envoy/client/net/WriteProxy.java b/src/main/java/envoy/client/net/WriteProxy.java
index 90e49e0..339f1f2 100644
--- a/src/main/java/envoy/client/net/WriteProxy.java
+++ b/src/main/java/envoy/client/net/WriteProxy.java
@@ -12,8 +12,8 @@ import envoy.util.EnvoyLog;
 /**
  * Implements methods to send {@link Message}s and
  * {@link MessageStatusChange}s to the server or cache them inside a
- * {@link LocalDB} depending on the online status.<br>
- * <br>
+ * {@link LocalDB} depending on the online status.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>WriteProxy.java</strong><br>
  * Created: <strong>6 Feb 2020</strong><br>
diff --git a/src/main/java/envoy/client/ui/IconUtil.java b/src/main/java/envoy/client/ui/IconUtil.java
index e2577ec..cdb99c5 100644
--- a/src/main/java/envoy/client/ui/IconUtil.java
+++ b/src/main/java/envoy/client/ui/IconUtil.java
@@ -8,11 +8,11 @@ import javafx.scene.image.Image;
 
 /**
  * Provides static utility methods for loading icons from the resource
- * folder.<br>
- * <br>
- * Project: <strong>envoy-client</strong>
- * File: <strong>IconUtil.java</strong>
- * Created: <strong>16.03.2020</strong>
+ * folder.
+ * <p>
+ * Project: <strong>envoy-client</strong><br>
+ * File: <strong>IconUtil.java</strong><br>
+ * Created: <strong>16.03.2020</strong><br>
  *
  * @author Kai S. K. Engelbart
  * @since Envoy Client v0.1-beta
diff --git a/src/main/java/envoy/client/ui/settings/package-info.java b/src/main/java/envoy/client/ui/settings/package-info.java
index f31317e..e908b93 100644
--- a/src/main/java/envoy/client/ui/settings/package-info.java
+++ b/src/main/java/envoy/client/ui/settings/package-info.java
@@ -1,7 +1,7 @@
 /**
  * This package contains classes used for representing the settings
- * visually.<br>
- * <br>
+ * visually.
+ * <p>
  * Project: <strong>envoy-client</strong><br>
  * File: <strong>package-info.java</strong><br>
  * Created: <strong>19 Apr 2020</strong><br>