diff --git a/app/eparser/enigma/lamedb.py b/app/eparser/enigma/lamedb.py
index da730077..013733fa 100644
--- a/app/eparser/enigma/lamedb.py
+++ b/app/eparser/enigma/lamedb.py
@@ -151,6 +151,7 @@ def parse_services(services, transponders, path):
         sp = "0"
         tid = data[2]
         nid = data[3]
+        srv_type = int(data[4])
         transponder_id = "{}:{}:{}".format(data[1], tid, nid)
         transponder = transponders.get(transponder_id, None)
 
@@ -160,7 +161,7 @@ def parse_services(services, transponders, path):
         onid = str(data[1]).lstrip(sp).upper()
         # For comparison in bouquets. Needed in upper case!!!
         fav_id = "{}:{}:{}:{}".format(ssid, tid, nid, onid)
-        picon_id = "1_0_{}_{}_{}_{}_{}_0_0_0.png".format(1, ssid, tid, nid, onid)
+        picon_id = "1_0_{:X}_{}_{}_{}_{}_0_0_0.png".format(srv_type, ssid, tid, nid, onid)
 
         all_flags = ch[2].split(",")
         coded = CODED_ICON if list(filter(lambda x: x.startswith("C:"), all_flags)) else None
diff --git a/app/ui/service_details_dialog.py b/app/ui/service_details_dialog.py
index 19a49b94..90f6bd8f 100644
--- a/app/ui/service_details_dialog.py
+++ b/app/ui/service_details_dialog.py
@@ -602,13 +602,13 @@ class ServiceDetailsDialog:
         self.update_reference_entry()
 
     def update_reference_entry(self):
-        srv_type = 0 if self._srv_type_entry.get_text() == "2" else 1
+        srv_type = int(self._srv_type_entry.get_text())
         ssid = int(self._sid_entry.get_text())
         tid = int(self._transponder_id_entry.get_text())
         nid = int(self._network_id_entry.get_text())
         if self._profile is Profile.ENIGMA_2:
             on_id = int(self._namespace_entry.get_text())
-            ref = "1:0:{}:{:X}:{:X}:{:X}:{:X}:0:0:0".format(srv_type, ssid, tid, nid, on_id)
+            ref = "1:0:{:X}:{:X}:{:X}:{:X}:{:X}:0:0:0".format(srv_type, ssid, tid, nid, on_id)
             self._reference_entry.set_text(ref)
         else:
             self._reference_entry.set_text("{:x}{:04x}{:04x}".format(tid, nid, ssid))