diff --git a/app/tools/picons.py b/app/tools/picons.py
index d3946303..39d47d57 100644
--- a/app/tools/picons.py
+++ b/app/tools/picons.py
@@ -109,6 +109,9 @@ class PiconsParser(HTMLParser):
                         namespace = "{:X}{:X}".format(int(pos), int(freq))
                     else:
                         namespace = "{:X}0000".format(int(pos))
+
+                    if single and not ssid.isdigit():
+                        ssid = "".join(c for c in ssid if c.isdigit()) or "0"
                     name = PiconsParser.format(ssid if single else p.ssid, on_id, namespace, picon_ids, s_type)
                     p_name = picons_path + (name if name else os.path.basename(p.ref))
                     picons_data.append(("{}{}".format(PiconsParser._BASE_URL, p.ref), p_name))
diff --git a/app/ui/picons_manager.py b/app/ui/picons_manager.py
index 4a1cd45b..40c927fa 100644
--- a/app/ui/picons_manager.py
+++ b/app/ui/picons_manager.py
@@ -556,7 +556,10 @@ class PiconsDialog:
                         executor.shutdown()
                         return
 
-                    picons.extend(future.result())
+                    pic = future.result()
+                    if pic:
+                        picons.extend(pic)
+
                 # Getting picon images.
                 futures = {executor.submit(download_picon, pic[0], pic[1], self.append_output): pic for pic in picons}
                 done, not_done = concurrent.futures.wait(futures, timeout=0)