8 files changed, 20 insertions, 16 deletions
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index f731a8fc1..71ee57a62 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -94,7 +94,7 @@
 <div>
 
     <h1>{{ _('Preferences') }}</h1>
-    <form method="post" action="{{ url_for('preferences') }}" id="search_form">
+    <form method="post" action="{{ url_for('preferences') }}" id="search_form" autocomplete="off">
 
         <!-- Nav tabs -->
         <ul class="nav nav-tabs nav-justified hide_if_nojs" role="tablist">
diff --git a/searx/templates/simple/about.html b/searx/templates/simple/about.html
index 9f6a10ced..f6a0a96a9 100644
--- a/searx/templates/simple/about.html
+++ b/searx/templates/simple/about.html
@@ -1,4 +1,4 @@
-{% extends 'simple/base.html' %}
+{% extends 'simple/page_with_header.html' %}
 {% block content %}
 {{ help.about | safe }}
 {% include "__common__/aboutextend.html" ignore missing %}
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index bb1f51cad..33b7a2cbe 100644
--- a/searx/templates/simple/base.html
+++ b/searx/templates/simple/base.html
@@ -35,7 +35,7 @@
   <link rel="icon" href="{{ url_for('static', filename='img/favicon.svg') }}" type="image/svg+xml">
 </head>
 <body class="{{ endpoint }}_endpoint" >
-  <main id="main_{{  self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}">
+  <main id="main_{{  self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}" class="{{body_class}}">
     {% if errors %}
         <div class="dialog-error" role="alert">
             <a href="#" class="close" aria-label="close" title="close">×</a>
@@ -47,6 +47,12 @@
         </div>
     {% endif %}
 
+    {% block linkto_preferences %}
+    {% from 'simple/icons.html' import icon_big %}
+      <nav id="linkto_preferences"><a href="{{ url_for('preferences') }}" aria-label="{{ _('preferences') }}">{{ icon_big('menu-outline') }}</a></nav>
+    {% endblock %}
+    {% block header %}
+    {% endblock %}
     {% block content %}
     {% endblock %}
   </main>
diff --git a/searx/templates/simple/index.html b/searx/templates/simple/index.html
index 1e4ea0c48..5a83e10a0 100644
--- a/searx/templates/simple/index.html
+++ b/searx/templates/simple/index.html
@@ -4,7 +4,6 @@
 	<link rel="preload" href="{{ url_for('static', filename='img/searxng.png') }}" as="image" />
 {% endblock %}
 {% block content %}
-<nav id="linkto_preferences"><a href="{{ url_for('preferences') }}">{{ icon_big('menu-outline') }}</a></nav>
 <div class="index">
     <div class="title"><h1>SearXNG</h1></div>
     {% include 'simple/simple_search.html' %}
diff --git a/searx/templates/simple/page_with_header.html b/searx/templates/simple/page_with_header.html
new file mode 100644
index 000000000..d4466b612
--- /dev/null
+++ b/searx/templates/simple/page_with_header.html
@@ -0,0 +1,5 @@
+{% set body_class = "page_with_header" %}
+{% extends "simple/base.html" %}
+{% block header %}
+<a href="{{ url_for('index') }}"><img class="logo" src="{{ url_for('static', filename='img/searxng.png') }}" alt="SearXNG"></a>
+{% endblock %}
diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html
index 898221166..b47cbc774 100644
--- a/searx/templates/simple/preferences.html
+++ b/searx/templates/simple/preferences.html
@@ -1,7 +1,7 @@
 {% from 'simple/macros.html' import tabs_open, tabs_close, tab_header, tab_footer, checkbox_onoff, checkbox %}
 {% from 'simple/icons.html' import icon_big %}
 
-{% extends "simple/base.html" %}
+{% extends "simple/page_with_header.html" %}
 
 {%- macro plugin_preferences(section) -%}
 {%- for plugin in plugins -%}
@@ -94,13 +94,11 @@
 {%- endmacro -%}
 
 {% block head %} {% endblock %}
+{% block linkto_preferences %}{% endblock %}
 {% block content %}
+<h1>{{ _('Preferences') }}</h1>
 
-<a href="{{ url_for('index') }}"><h1><span>SearXNG</span></h1></a>
-
-<h2>{{ _('Preferences') }}</h2>
-
-<form id="search_form" method="post" action="{{ url_for('preferences') }}">
+<form id="search_form" method="post" action="{{ url_for('preferences') }}" autocomplete="off">
 
 {{ tabs_open() }}
 
diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html
index b9764addd..4149f83c3 100644
--- a/searx/templates/simple/results.html
+++ b/searx/templates/simple/results.html
@@ -10,7 +10,6 @@
 {% block title %}{% if query_in_title %}{{- q|e }} - {% endif %}{% endblock %}
 {% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ url_for('search', _external=True) }}?q={{ q|urlencode }}&amp;categories={{ selected_categories|join(",") | replace(' ','+') }}&amp;pageno={{ pageno }}&amp;time_range={{ time_range }}&amp;language={{ current_language }}&amp;safesearch={{ safesearch }}&amp;format=rss">{% endblock %}
 {% block content %}
-<nav id="linkto_preferences"><a href="{{ url_for('preferences') }}">{{ icon_big('menu-outline') }}</a></nav>
 {% include 'simple/search.html' %}
 
 {% if results and results|map(attribute='template')|unique|list|count == 1 %}
diff --git a/searx/templates/simple/stats.html b/searx/templates/simple/stats.html
index 1e905790a..f45f5b260 100644
--- a/searx/templates/simple/stats.html
+++ b/searx/templates/simple/stats.html
@@ -1,7 +1,7 @@
 {% from 'simple/icons.html' import icon_big %}
 {% from '__common__/new_issue.html' import new_issue with context %}
 
-{% extends "simple/base.html" %}
+{% extends "simple/page_with_header.html" %}
 
 {%- macro th_sort(column_order, column_name) -%}
     {% if selected_engine_name %}
@@ -15,10 +15,7 @@
 
 {% block head %} {% endblock %}
 {% block content %}
-
-<a href="{{ url_for('index') }}"><h1><span>SearXNG</span></h1></a>
-
-<h2>{% if selected_engine_name %}<a href="{{ url_for('stats') }}">{% endif %}{{ _('Engine stats') }}{% if selected_engine_name %}</a> - {{ selected_engine_name }}{% endif %}</h2>
+<h1>{% if selected_engine_name %}<a href="{{ url_for('stats') }}">{% endif %}{{ _('Engine stats') }}{% if selected_engine_name %}</a> - {{ selected_engine_name }}{% endif %}</h1>
 
 {% if not engine_stats.get('time') %}
 {{ _('There is currently no data available. ') }}