diff --git a/actions/searx b/actions/searx
index 4ef0a1c69..10f70cb53 100755
--- a/actions/searx
+++ b/actions/searx
@@ -53,7 +53,7 @@ def _copy_uwsgi_configuration():
                       'uwsgi/apps-available/searx.ini')
     destination = '/etc/uwsgi/apps-available/'
 
-    if not os.path.exists(destination):
+    if not os.path.exists(os.path.join(destination, 'searx.ini')):
         shutil.copy(example_config, destination)
         action_utils.webserver_enable('uwsgi', kind='module')
 
@@ -83,9 +83,9 @@ def subcommand_setup(_):
 
 def subcommand_enable(_):
     """Enable web configuration and reload."""
-    # TODO Write action_utils functions for enable/disable uwsgi
-    os.symlink('/etc/uwsgi/apps-available/searx.ini',
-               '/etc/uwsgi/apps-enabled/')
+    if not os.path.exists('/etc/uwsgi/apps-enabled/searx.ini'):
+        os.symlink('/etc/uwsgi/apps-available/searx.ini',
+                   '/etc/uwsgi/apps-enabled/searx.ini')
     action_utils.webserver_enable('searx-freedombox')
 
 
diff --git a/data/etc/apache2/conf-available/searx-freedombox.conf b/data/etc/apache2/conf-available/searx-freedombox.conf
index 69d92392f..2435d475a 100644
--- a/data/etc/apache2/conf-available/searx-freedombox.conf
+++ b/data/etc/apache2/conf-available/searx-freedombox.conf
@@ -1,5 +1,4 @@
-<Location /searx>
-    Options FollowSymLinks Indexes
-    SetHandler uwsgi-handler
-    uWSGISocket /run/uwsgi/app/searx/socket
-</Location>
\ No newline at end of file
+<Location /searx/>
+    ProxyPass unix:/run/uwsgi/app/searx/socket|uwsgi://uwsgi-uds-searx/
+</Location>
+
diff --git a/static/themes/default/icons/searx.png b/static/themes/default/icons/searx.png
index 2db081710..3818d3d60 100644
Binary files a/static/themes/default/icons/searx.png and b/static/themes/default/icons/searx.png differ