diff --git a/docs/_static/custom.css b/docs/_static/custom.css
index 88405bf096687acb378433b13e743a16802f96a9..efc9b1ade3e8b465565e494a2f932b9f4a274617 100644
--- a/docs/_static/custom.css
+++ b/docs/_static/custom.css
@@ -19,11 +19,35 @@ table.swh-logos-table img {
   margin-bottom: 5px;
 }
 
+
+table.swh-logos-table tr td:nth-child(1) {
+  width: min-content;
+}
+
+table.swh-logos-table tr td:nth-child(1) p {
+  margin-bottom: 0;
+}
+
 table.swh-logos-table ul {
   text-align: left;
   margin-bottom: auto;
 }
 
+table.swh-logos-table .py {
+  font-family: inherit;
+  font-weight: inherit;
+  font-size: inherit;
+  white-space: inherit;
+  background-color: inherit;
+  border: inherit;
+  border-radius: inherit;
+  padding: inherit;
+}
+
+table.swh-logos-table .py .pre {
+  white-space: inherit;
+}
+
 .landing-page hr {
   margin-top: 5em;
   margin-bottom: 5em;
diff --git a/docs/user/software-origins/index.rst b/docs/user/software-origins/index.rst
index 697e0adeaaef6aa48833b20b1c40b8f30446e70e..c71aa04830706899a76e53d7d2a830e5b0706a1f 100644
--- a/docs/user/software-origins/index.rst
+++ b/docs/user/software-origins/index.rst
@@ -1,3 +1,5 @@
+:html_theme.sidebar_secondary.remove:
+
 .. _user-software-origins:
 
 Software Origins
diff --git a/swh/docs/generate_software_origins_list.py b/swh/docs/generate_software_origins_list.py
index c234b59b5e0266df959fd0da1433b4dc5b172486..58bd732089ff58e6c6997643a2dd180abf84f565 100644
--- a/swh/docs/generate_software_origins_list.py
+++ b/swh/docs/generate_software_origins_list.py
@@ -35,7 +35,7 @@ def write_table(data, file) -> None:
     )
     table = []
     for (forge_id, forge) in sorted(data["forges"].items()):
-        logo_cell = f"|{forge_id}_logo|\n\n:ref:`user-software-origins-{forge_id}`"
+        logo_cell = f"|{forge_id}_logo|\n\n:ref:`{forge['name']} <user-software-origins-{forge_id}>`"
 
         has_loader = forge["loader"]["status"] != "N/A"
         has_lister = forge["lister"]["status"] != "N/A"
@@ -212,7 +212,6 @@ def write_logos(data, file) -> None:
     for (forge_id, forge) in sorted(data["forges"].items()):
         file.write(
             f".. |{forge_id}_logo| image:: ../logos/{forge_id}.png\n"
-            f"  :width: 50%\n"
             f"  :target: {forge_id}.html\n"
             f"  :alt: {forge['name']}\n"
             f"\n"