5 files changed, 7 insertions, 105 deletions
diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html
deleted file mode 100644
index 5a9065f03..000000000
--- a/searx/templates/__common__/about.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<div{% if rtl %} dir="ltr"{% endif %}>
-  <h1>About <a href="{{ url_for('index') }}">searxng</a></h1>
-
-  <p>
-    SearXNG is a fork from the well-known <a href="https://github.com/searx/searx">searx</a>
-    <a href="https://en.wikipedia.org/wiki/Metasearch_engine"> metasearch engine</a>,
-    aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a>
-    while not storing information about its users.
-  </p>
-
-  <p>More about SearXNG ...</p>
-
-  <ul>
-    <li><a href="{{ searx_git_url }}">SearXNG sources</a></li>
-    <li><a href="https://weblate.bubu1.eu/projects/searxng/">weblate</a></li>
-  </ul>
-
-  <hr />
-
-  <h2>Why use it?</h2>
-
-  <ul>
-    <li>
-      SearXNG may not offer you as personalised results as Google, but it doesn't
-      generate a profile about you.
-    </li>
-    <li>
-      SearXNG doesn't care about what you search for, never shares anything with a
-      third party, and it can't be used to compromise you.
-    </li>
-    <li>
-      SearXNG is free software, the code is 100% open and you can help to make
-      it better.  See more on <a href="{{ searx_git_url
-      }}">SearXNG sources</a>.
-    </li>
-  </ul>
-
-  <p>
-    If you do care about privacy, want to be a conscious user, or otherwise
-    believe in digital freedom, make SearXNG your default search engine or run
-    it on your own server
-  </p>
-
-  <h2>Technical details - How does it work?</h2>
-
-  <p>
-    SearXNG is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
-    inspired by the <a href="https://beniz.github.io/seeks/">seeks project</a>.
-
-    It provides basic privacy by mixing your queries with searches on other
-    platforms without storing search data. Queries are made using a POST request
-    on every browser (except Chromium-based browsers*).  Therefore they show up
-    in neither our logs, nor your url history. In the case of Chromium-based
-    browser users there is an exception: searx uses the search bar to perform GET
-    requests.
-
-    SearXNG can be added to your browser's search bar; moreover, it can be set as
-    the default search engine.
-  </p>
-
-  <h2 id='add to browser'>How to set as the default search engine?</h2>
-
-  <p>
-    SearXNG supports <a href="https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md">OpenSearch</a>.
-    For more information on changing your default search engine, see your browser's documentation:
-  </p>
-
-  <ul>
-    <li><a href="https://support.mozilla.org/en-US/kb/add-or-remove-search-engine-firefox">Firefox</a></li>
-    <li><a href="https://support.microsoft.com/en-us/help/4028574/microsoft-edge-change-the-default-search-engine">Microsoft Edge</a></li>
-    <li>Chromium-based browsers <a href="https://www.chromium.org/tab-to-search">only add websites that the user navigates to without a path.</a>
-  </ul>
-
-  <h2>Where to find anonymous usage statistics of this instance ?</h2>
-
-  <p>
-    <a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.
-  </p>
-
-  <h2>How can I make it my own?</h2>
-
-  <p>
-    SearXNG appreciates your concern regarding logs, so take the code from
-    the <a href="{{ searx_git_url }}">SearXNG project</a> and
-    run it yourself!
-  </p>
-  <p>
-    Add your instance to this <a href="{{ get_setting('brand.public_instances') }}"> list of
-    public instances</a> to help other people reclaim their privacy and make the
-    Internet freer!  The more decentralized the Internet is, the more freedom we
-    have!
-  </p>
-
-  <h2>Where are the docs & code of this instance?</h2>
-
-  <p>
-    See the <a href="{{ get_setting('brand.docs_url') }}">SearXNG docs</a>
-    and <a href="{{ searx_git_url }}">SearXNG sources</a>
-  </p>
-
-</div>
-{% include "__common__/aboutextend.html" ignore missing %}
diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html
index bc7fed8e1..a644761b6 100644
--- a/searx/templates/oscar/about.html
+++ b/searx/templates/oscar/about.html
@@ -1,5 +1,6 @@
 {% extends "oscar/base.html" %}
 {% block title %}{{ _('about') }} - {% endblock %}
 {% block content %}
-{% include '__common__/about.html' %}
+{{ help.about | safe }}
+{% include "__common__/aboutextend.html" ignore missing %}
 {% endblock %}
diff --git a/searx/templates/simple/about.html b/searx/templates/simple/about.html
index 1913879da..9f6a10ced 100644
--- a/searx/templates/simple/about.html
+++ b/searx/templates/simple/about.html
@@ -1,4 +1,5 @@
 {% extends 'simple/base.html' %}
 {% block content %}
-{% include '__common__/about.html' %}
+{{ help.about | safe }}
+{% include "__common__/aboutextend.html" ignore missing %}
 {% endblock %}
diff --git a/searx/templates/simple/icons.html b/searx/templates/simple/icons.html
index 3093e3e29..c23c32ee7 100644
--- a/searx/templates/simple/icons.html
+++ b/searx/templates/simple/icons.html
@@ -5,7 +5,7 @@
   'chevron-up-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="48" d="M112 328l144-144 144 144"/></svg>',
   'chevron-right':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="48" d="M184 112l144 144-144 144"/></svg>',
   'chevron-left':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="48" d="M328 112L184 256l144 144"/></svg>',
-  'menu-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M80 160h352M80 256h352M80 352h352"/></svg>',
+  'menu-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M262.29 192.31a64 64 0 1057.4 57.4 64.13 64.13 0 00-57.4-57.4zM416.39 256a154.34 154.34 0 01-1.53 20.79l45.21 35.46a10.81 10.81 0 012.45 13.75l-42.77 74a10.81 10.81 0 01-13.14 4.59l-44.9-18.08a16.11 16.11 0 00-15.17 1.75A164.48 164.48 0 01325 400.8a15.94 15.94 0 00-8.82 12.14l-6.73 47.89a11.08 11.08 0 01-10.68 9.17h-85.54a11.11 11.11 0 01-10.69-8.87l-6.72-47.82a16.07 16.07 0 00-9-12.22 155.3 155.3 0 01-21.46-12.57 16 16 0 00-15.11-1.71l-44.89 18.07a10.81 10.81 0 01-13.14-4.58l-42.77-74a10.8 10.8 0 012.45-13.75l38.21-30a16.05 16.05 0 006-14.08c-.36-4.17-.58-8.33-.58-12.5s.21-8.27.58-12.35a16 16 0 00-6.07-13.94l-38.19-30A10.81 10.81 0 0149.48 186l42.77-74a10.81 10.81 0 0113.14-4.59l44.9 18.08a16.11 16.11 0 0015.17-1.75A164.48 164.48 0 01187 111.2a15.94 15.94 0 008.82-12.14l6.73-47.89A11.08 11.08 0 01213.23 42h85.54a11.11 11.11 0 0110.69 8.87l6.72 47.82a16.07 16.07 0 009 12.22 155.3 155.3 0 0121.46 12.57 16 16 0 0015.11 1.71l44.89-18.07a10.81 10.81 0 0113.14 4.58l42.77 74a10.8 10.8 0 01-2.45 13.75l-38.21 30a16.05 16.05 0 00-6.05 14.08c.33 4.14.55 8.3.55 12.47z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>',
   'ellipsis-vertical-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><circle cx="256" cy="256" r="32" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><circle cx="256" cy="416" r="32" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><circle cx="256" cy="96" r="32" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/></svg>',
   'magnet-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M421.83 293.82A144 144 0 00218.18 90.17M353.94 225.94a48 48 0 00-67.88-67.88" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32" d="M192 464v-48M90.18 421.82l33.94-33.94M48 320h48"/><path d="M286.06 158.06L172.92 271.19a32 32 0 01-45.25 0L105 248.57a32 32 0 010-45.26L218.18 90.17M421.83 293.82L308.69 407a32 32 0 01-45.26 0l-22.62-22.63a32 32 0 010-45.26l113.13-113.17M139.6 169.98l67.88 67.89M275.36 305.75l67.89 67.88" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/></svg>',
   'globe-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M256 48C141.13 48 48 141.13 48 256s93.13 208 208 208 208-93.13 208-208S370.87 48 256 48z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M256 48c-58.07 0-112.67 93.13-112.67 208S197.93 464 256 464s112.67-93.13 112.67-208S314.07 48 256 48z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M117.33 117.33c38.24 27.15 86.38 43.34 138.67 43.34s100.43-16.19 138.67-43.34M394.67 394.67c-38.24-27.15-86.38-43.34-138.67-43.34s-100.43 16.19-138.67 43.34" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32" d="M256 48v416M464 256H48"/></svg>',
diff --git a/searx/templates/simple/macros.html b/searx/templates/simple/macros.html
index c1c421ab1..6c64c23ea 100644
--- a/searx/templates/simple/macros.html
+++ b/searx/templates/simple/macros.html
@@ -1,3 +1,5 @@
+{% from 'simple/icons.html' import icon_small %}
+
 <!-- Draw favicon -->
 {% macro draw_favicon(favicon) -%}
     <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='themes/simple/img/icons/' + favicon + '.png') }}" alt="{{ favicon }}">