diff --git a/src/fr/devinsy/statoolinfos/core/Categories.java b/src/fr/devinsy/statoolinfos/core/Categories.java
index 6781833..b09cd3f 100644
--- a/src/fr/devinsy/statoolinfos/core/Categories.java
+++ b/src/fr/devinsy/statoolinfos/core/Categories.java
@@ -82,7 +82,7 @@ public class Categories extends ArrayList<Category>
             {
                 Category category = iterator.next();
 
-                if (category.getSoftwares().contains(softwareName))
+                if (category.getSoftwares().containsIgnoreCase(softwareName))
                 {
                     ended = true;
                     result = true;
diff --git a/src/fr/devinsy/statoolinfos/core/Category.java b/src/fr/devinsy/statoolinfos/core/Category.java
index eb6f34c..3f5e09b 100644
--- a/src/fr/devinsy/statoolinfos/core/Category.java
+++ b/src/fr/devinsy/statoolinfos/core/Category.java
@@ -109,7 +109,7 @@ public class Category
     {
         boolean result;
 
-        if (this.softwares.contains(service.getSoftwareName()))
+        if (this.softwares.containsIgnoreCase(service.getSoftwareName()))
         {
             result = true;
         }
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
index b4fd091..f19a9f0 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
@@ -59,7 +59,7 @@ public class ServicePage
 
             TagDataManager data = new TagDataManager();
 
-            data.setAttribute("serviceLogo", "src", organization.getTechnicalName() + "-" + service.getTechnicalName() + "-logo.png");
+            data.setAttribute("serviceLogo", "src", service.getLogoFileName());
 
             data.setEscapedContent("serviceName", service.getName());
             data.setAttribute("serviceName", "href", service.getWebsite());