diff --git a/store/templates/base.html b/store/templates/base.html
index 887d5fb9..5f96ad1b 100644
--- a/store/templates/base.html
+++ b/store/templates/base.html
@@ -4,7 +4,7 @@
   <head>
     <title>YunoHost app store</title>
     <meta charset="UTF-8">
-    <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0"> -->
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script src="{{ url_for('static', filename='tailwindcss.js') }}"></script>
     <link rel="stylesheet" href="{{ url_for('static', filename='fork-awesome.min.css') }}" rel="preload">
   </head>
@@ -39,7 +39,7 @@
               <div class="flex items-center gap-4">
                 <div class="sm:flex sm:gap-4">
                   <a
-                    class="hidden rounded-md bg-gray-100 px-5 py-2.5 text-sm font-medium text-teal-600 transition hover:text-teal-600/75 sm:block"
+                    class="rounded-md border text-blue-600 border-blue-500 px-5 py-2.5 text-sm font-medium hover:text-blue-400 hidden md:block"
                     href="https://yunohost.org/docs/"
                   >
                     <i class="fa fa-external-link fa-fw" aria-hidden="true"></i>
@@ -47,7 +47,7 @@
                   </a>
                   {% if not user %}
                   <a
-                    class="block rounded-md bg-teal-600 px-5 py-2.5 text-sm font-medium text-white transition hover:bg-teal-700"
+                    class="rounded-md bg-blue-500 px-5 py-2.5 text-sm font-medium text-white transition hover:bg-blue-700 hidden md:block"
                     href="{{ url_for('login_using_discourse') }}"
                   >
                     Login using YunoHost's forum
@@ -66,18 +66,7 @@
                     <p class="ms-2 hidden text-left text-xs sm:block">
                       <strong class="block font-medium">{{ user['username'] }}</strong>
                     </p>
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      class="ms-4 hidden h-5 w-5 text-gray-500 transition group-hover:text-gray-700 sm:block"
-                      viewBox="0 0 20 20"
-                      fill="currentColor"
-                    >
-                      <path
-                        fill-rule="evenodd"
-                        d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
-                        clip-rule="evenodd"
-                      />
-                    </svg>
+                    <i class="fa fa-caret-down fa-fw" aria-hidden="true"></i>
                   </button>
                   <!--
                   <a
@@ -94,20 +83,7 @@
                   class="block rounded bg-gray-100 p-2.5 text-gray-600 transition hover:text-gray-600/75 md:hidden"
                 >
                   <span class="sr-only">Toggle menu</span>
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    class="h-5 w-5"
-                    fill="none"
-                    viewBox="0 0 24 24"
-                    stroke="currentColor"
-                    stroke-width="2"
-                  >
-                    <path
-                      stroke-linecap="round"
-                      stroke-linejoin="round"
-                      d="M4 6h16M4 12h16M4 18h16"
-                    />
-                  </svg>
+                  <i class="fa fa-bars h-5 w-5" aria-hidden="true"></i>
                 </button>
               </div>
             </div>
diff --git a/store/templates/wishlist.html b/store/templates/wishlist.html
index 28f0da7f..570f70e2 100644
--- a/store/templates/wishlist.html
+++ b/store/templates/wishlist.html
@@ -47,10 +47,9 @@
         <th class="whitespace-nowrap px-4 py-2 font-medium text-gray-900">
           Description
         </th>
-        <th class="px-1 py-2"></th>
-        <th class="px-1 py-2"></th>
-        <th class="px-1 py-2"></th>
-        <th class="px-1 py-2"></th>
+        <th class="py-2"></th>
+        <th class="py-2"></th>
+        <th class="whitespace-nowrap px-4 py-2 font-medium text-gray-900 max-w-[5em]">Popularity</th>
       </tr>
     </thead>
 
@@ -61,7 +60,7 @@
                 {{ infos['name'] }}
             </td>
             <td class="px-4 py-2 text-gray-700 max-w-md">{{ infos['description'] }}</td>
-            <td class="px-1 py-2">
+            <td class="py-2">
               {% if infos['website'] %}
               <a
                 href="{{ infos['website'] }}"
@@ -71,7 +70,7 @@
               </a>
               {% endif %}
             </td>
-            <td class="px-1 py-2">
+            <td class="py-2">
               {% if infos['upstream'] %}
               <a
                 href="{{ infos['upstream'] }}"
@@ -81,20 +80,16 @@
               </a>
               {% endif %}
             </td>
-            <td class="px-1 py-2">
-              <a
-                href="#"
-                class="inline-block rounded-md border text-blue-600 border-blue-500 px-4 py-2 text-xs font-medium hover:bg-blue-500 hover:text-white"
-              >
-                <i class="fa fa-bookmark fa-fw" aria-hidden="true"></i>
-                Vote
+            <td class="text-center max-w-[5em]">
+                <a
+                  href="#"
+                  class="inline-block group rounded-md border text-violet-600 border-violet-500 px-2 py-2 text-xs font-medium hover:bg-violet-500 hover:text-white"
+                >
+                        123 <i class="fa fa-star-o inline-block group-hover:hidden" aria-hidden="true"></i>
+                            <i class="fa fa-star   hidden group-hover:inline-block" aria-hidden="true"></i>
+                </a>
               </a>
             </td>
-            <td class="px-1 py-2">
-                <span class="text-blue-500">
-                    123 <i class="fa fa-bookmark" aria-hidden="true"></i>
-                </span>
-            </td>
         </tr>
         {% endfor %}
     </tbody>
