diff --git a/app/views/admin/backups/show.html.erb b/app/views/admin/backups/show.html.erb
index cd098e289e1..c2a260efd30 100644
--- a/app/views/admin/backups/show.html.erb
+++ b/app/views/admin/backups/show.html.erb
@@ -1,4 +1,4 @@
-<%#-- copyright
+<%# -- copyright
 OpenProject is an open source project management software.
 Copyright (C) the OpenProject GmbH
 
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 See COPYRIGHT and LICENSE files for more details.
 
-++#%>
+++# %>
 
 <% html_title t(:label_administration), t(:label_backup) -%>
 
@@ -36,24 +36,22 @@ See COPYRIGHT and LICENSE files for more details.
 </p>
 
 <% if Token::Backup.count > 0 %>
-  <p>
-    <span><%= I18n.t("backup.label_token_users") %></span>:
+  <span><%= I18n.t("backup.label_token_users") %></span>:
 
-    <div class="wiki">
-      <ul>
-        <% Token::Backup.includes(:user).each do |token| %>
-          <li>
-            <% if current_user.allowed_globally?(:manage_user) %>
-              <%= link_to token.user.name, edit_user_path(token.user) %>
-            <% else %>
-              <%= token.user.name %>
-            <% end %>
-            <%= token.user == current_user ? "(#{I18n.t(:you)})" : "" %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
-  </p>
+  <div class="wiki">
+    <ul>
+      <% Token::Backup.includes(:user).each do |token| %>
+        <li>
+          <% if current_user.allowed_globally?(:manage_user) %>
+            <%= link_to token.user.name, edit_user_path(token.user) %>
+          <% else %>
+            <%= token.user.name %>
+          <% end %>
+          <%= token.user == current_user ? "(#{I18n.t(:you)})" : "" %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
 <% end %>
 
 <% if @backup_token.present? %>
diff --git a/app/views/user_mailer/activation_limit_reached.html.erb b/app/views/user_mailer/activation_limit_reached.html.erb
index e506f0f5847..e122b345f57 100644
--- a/app/views/user_mailer/activation_limit_reached.html.erb
+++ b/app/views/user_mailer/activation_limit_reached.html.erb
@@ -1,4 +1,4 @@
-<%#-- copyright
+<%# -- copyright
 OpenProject is an open source project management software.
 Copyright (C) the OpenProject GmbH
 
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 See COPYRIGHT and LICENSE files for more details.
 
-++#%>
+++# %>
 
 <p>
     <% mail_link = "<a href=\"mailto:#{@email}\">#{@email}</a>" %>
@@ -34,14 +34,12 @@ See COPYRIGHT and LICENSE files for more details.
     <%= t("mail_user_activation_limit_reached.message", email: mail_link, host: host_link).html_safe %>
 </p>
 
-<p>
-    <span><%= t("mail_user_activation_limit_reached.steps.label") %></span>
-    <ul>
-        <li>
-            <%= link_translate("mail_user_activation_limit_reached.steps.a", links: { upgrade_url: OpenProject::Enterprise.upgrade_url }) %>
-        </li>
-        <li>
-            <%= link_translate("mail_user_activation_limit_reached.steps.b", links: { users_url: users_url }) %>
-        </li>
-    </ul>
-</p>
+<span><%= t("mail_user_activation_limit_reached.steps.label") %></span>
+<ul>
+    <li>
+        <%= link_translate("mail_user_activation_limit_reached.steps.a", links: { upgrade_url: OpenProject::Enterprise.upgrade_url }) %>
+    </li>
+    <li>
+        <%= link_translate("mail_user_activation_limit_reached.steps.b", links: { users_url: users_url }) %>
+    </li>
+</ul>
diff --git a/app/views/user_mailer/attachments_added.html.erb b/app/views/user_mailer/attachments_added.html.erb
index e1cdc5c6e55..b58d342a306 100644
--- a/app/views/user_mailer/attachments_added.html.erb
+++ b/app/views/user_mailer/attachments_added.html.erb
@@ -1,4 +1,4 @@
-<%#-- copyright
+<%# -- copyright
 OpenProject is an open source project management software.
 Copyright (C) the OpenProject GmbH
 
@@ -25,13 +25,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 See COPYRIGHT and LICENSE files for more details.
 
-++#%>
+++# %>
 
-<p>
-  <%= link_to @added_to, @added_to_url %><br>
-  <ul>
-    <% @attachments.each do |attachment | %>
-      <li><%= attachment.filename %></li>
-    <% end %>
-  </ul>
-</p>
+
+<%= link_to @added_to, @added_to_url %><br>
+<ul>
+  <% @attachments.each do |attachment | %>
+    <li><%= attachment.filename %></li>
+  <% end %>
+</ul>
diff --git a/modules/documents/app/views/help/wiki_syntax_detailed.html.erb b/modules/documents/app/views/help/wiki_syntax_detailed.html.erb
index 2444b4e1614..9fce590c933 100644
--- a/modules/documents/app/views/help/wiki_syntax_detailed.html.erb
+++ b/modules/documents/app/views/help/wiki_syntax_detailed.html.erb
@@ -1,4 +1,4 @@
-<%#-- copyright
+<%# -- copyright
 OpenProject is an open source project management software.
 Copyright (C) the OpenProject GmbH
 
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 See COPYRIGHT and LICENSE files for more details.
 
-++#%>
+++# %>
 
 <% content_for :styles do %>
     body { font:80% Verdana,Tahoma,Arial,sans-serif; }
@@ -253,9 +253,9 @@ To go live, all you need to add is a database and a web server.
 
     <p>OpenProject has the following builtin macros:</p>
 
-    <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
+    <dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
 
-    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></p>
+    <pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl>
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>