diff --git a/app/layout/simple.phtml b/app/layout/simple.phtml
index 89fe69005..4357b6fdf 100644
--- a/app/layout/simple.phtml
+++ b/app/layout/simple.phtml
@@ -26,12 +26,9 @@
 <div class="app-layout app-layout-simple">
 	<div class="header">
 		<div class="item title">
-			<h1>
-				<a href="<?= _url('index', 'index') ?>">
-					<img class="logo" src="<?= _i('icon', true) ?>" alt="" />
-					<?= FreshRSS_Context::$system_conf->title ?>
-				</a>
-			</h1>
+			<a href="<?= _url('index', 'index') ?>">
+				<img class="logo" src="<?= _i('FreshRSS-logo', true) ?>" alt="" />
+			</a>
 		</div>
 
 		<div class="item"></div>
diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml
index 76a5b734b..2939e068b 100644
--- a/app/views/configure/queries.phtml
+++ b/app/views/configure/queries.phtml
@@ -7,7 +7,7 @@
 
 	<form method="post" action="<?= _url('configure', 'queries') ?>" class="draggableList">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
-		<h1><?= _t('conf.query') ?></h1>
+		<h2><?= _t('conf.query') ?></h2>
 
 		<?php foreach ($this->queries as $key => $query) { ?>
 		<div class="form-group" id="query-group-<?= $key ?>" draggable="true">
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml
index 022d5e8e3..a2ab7a938 100644
--- a/app/views/helpers/category/update.phtml
+++ b/app/views/helpers/category/update.phtml
@@ -1,5 +1,5 @@
 <div class="post">
-	<h1><?= $this->category->name() ?></h1>
+	<h2><?= $this->category->name() ?></h2>
 
 	<div>
 		<a href="<?= _url('index', 'index', 'get', 'c_' . $this->category->id()) ?>"><?= _i('link') ?> <?= _t('gen.action.filter') ?></a>
diff --git a/app/views/helpers/configure/query.phtml b/app/views/helpers/configure/query.phtml
index 38a1a715c..a9bf4478d 100644
--- a/app/views/helpers/configure/query.phtml
+++ b/app/views/helpers/configure/query.phtml
@@ -1,5 +1,5 @@
 <div class="post">
-	<h1><?= $this->query->getName() ?></h1>
+	<h2><?= $this->query->getName() ?></h2>
 
 	<div>
 		<a href="<?= $this->query->getUrl() ?>"><?= _i('link') ?> <?= _t('gen.action.filter') ?></a>
diff --git a/app/views/helpers/extension/configure.phtml b/app/views/helpers/extension/configure.phtml
index 4a6dfe357..4f8c521ae 100644
--- a/app/views/helpers/extension/configure.phtml
+++ b/app/views/helpers/extension/configure.phtml
@@ -1,8 +1,8 @@
 <div class="post">
-	<h1>
+	<h2>
 		<?= $this->extension->getName() ?> (<?= $this->extension->getVersion() ?>) —
 		<?= $this->extension->isEnabled() ? _t('admin.extensions.enabled') : _t('admin.extensions.disabled') ?>
-	</h1>
+	</h2>
 
 	<p class="alert alert-warn"><?= $this->extension->getDescription() ?> — <?= _t('gen.short.by_author'), ' ', $this->extension->getAuthor() ?></p>
 
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index 699191b6e..fedf6ff0b 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -10,25 +10,22 @@
 	<?php } ?>
 
 	<h1><?= _t('index.about') ?></h1>
-
-	<dl class="infos">
-		<dt><?= _t('index.about.project_website') ?></dt>
-		<dd><a href="<?= FRESHRSS_WEBSITE ?>"><?= FRESHRSS_WEBSITE ?></a></dd>
-
-		<dt><?= _t('index.about.bugs_reports') ?></dt>
-		<dd><?= _t('index.about.github') ?></dd>
-
-		<dt><?= _t('index.about.license') ?></dt>
-		<dd><?= _t('index.about.agpl3') ?></dd>
-
-		<?php if (FreshRSS_Auth::hasAccess()): ?>
-		<dt><?= _t('index.about.version') ?></dt>
-		<dd><?= FRESHRSS_VERSION ?></dd>
-		<?php endif; ?>
-	</dl>
-
 	<p><?= _t('index.about.freshrss_description') ?></p>
 
-	<h1><?= _t('index.about.credits') ?></h1>
+	<h2><?= _t('index.about.project_website') ?></h2>
+	<a href="<?= FRESHRSS_WEBSITE ?>"><?= FRESHRSS_WEBSITE ?></a>
+
+	<h2><?= _t('index.about.bugs_reports') ?></h2>
+	<?= _t('index.about.github') ?>
+
+	<h2><?= _t('index.about.license') ?></h2>
+	<?= _t('index.about.agpl3') ?>
+
+	<?php if (FreshRSS_Auth::hasAccess()): ?>
+	<h2><?= _t('index.about.version') ?></h2>
+	<?= FRESHRSS_VERSION ?>
+	<?php endif; ?>
+
+	<h2><?= _t('index.about.credits') ?></h2>
 	<p><?= _t('index.about.credits_content') ?></p>
 </div>
diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml
index bc8fc2d0e..7a4beb679 100644
--- a/app/views/user/profile.phtml
+++ b/app/views/user/profile.phtml
@@ -99,10 +99,11 @@
 	<?php } ?>
 
 	<?php if (!FreshRSS_Auth::hasAccess('admin')) { ?>
+	<h2><?= _t('conf.profile.delete') ?></h2>
+
 	<form id="crypto-form" method="post" action="<?= _url('user', 'delete') ?>">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
-		<legend><?= _t('conf.profile.delete') ?></legend>
-
+		
 		<p class="alert alert-warn"><span class="alert-head"><?= _t('gen.short.attention') ?></span> <?= _t('conf.profile.delete.warn') ?></p>
 
 		<div class="form-group">