diff --git a/lists/estonia.md b/lists/estonia.md
index f085d56..a9f6079 100644
--- a/lists/estonia.md
+++ b/lists/estonia.md
@@ -2,8 +2,8 @@
 
 | #   | Channel        | Link  | Logo | EPG id |
 |:---:|:--------------:|:-----:|:----:|:------:|
-| 1   | ETV Ⓖ     | [>](http://sb.err.ee/live/etv.m3u8) | <img height="20" src="https://i.imgur.com/SAOGSmL.png"/> | ETV.ee |
-| 2   | ETV2 Ⓖ    | [>](http://sb.err.ee/live/etv2.m3u8) | <img height="20" src="https://i.imgur.com/wY6Pz37.png"/> | ETV2.ee |
-| 3   | ETV+ Ⓖ    | [>](http://sb.err.ee/live/etvpluss.m3u8) | <img height="20" src="https://i.imgur.com/L8fGd9d.png"/> | ETVPlus.ee |
-| 4   | Riigikogu  | [>](https://riigikogu.babahhcdn.com/bb1027/smil:riigikogu_ch1.smil/playlist.m3u8) | <img height="20" src="https://i.imgur.com/xuySaSN.png"/> | Riigikogu.ee |
-| 5   | Taevas TV7 | [>](https://vod.tv7.fi/tv7-ee/_definst_/smil:tv7-ee.smil/playlist.m3u8) | <img height="20" src="https://i.imgur.com/FaQQdzz.png"/> | TaevasTV7.fi |
+| 1   | ETV Ⓖ     | [>](http://sb.err.ee/live/etv.m3u8) | <img height="20" src="https://i.imgur.com/5URjPgG.png"/> | ETV.ee |
+| 2   | ETV2 Ⓖ    | [>](http://sb.err.ee/live/etv2.m3u8) | <img height="20" src="https://i.imgur.com/fUjGHDa.png"/> | ETV2.ee |
+| 3   | ETV+ Ⓖ    | [>](http://sb.err.ee/live/etvpluss.m3u8) | <img height="20" src="https://i.imgur.com/YAubPlU.png"/> | ETVPlus.ee |
+| 4   | Riigikogu  | [>](https://riigikogu.babahhcdn.com/bb1027/smil:riigikogu_ch1.smil/playlist.m3u8) | <img height="20" src="https://i.imgur.com/7uWaZLF.png"/> | Riigikogu.ee |
+| 5   | Taevas TV7 | [>](https://vod.tv7.fi/tv7-ee/_definst_/smil:tv7-ee.smil/playlist.m3u8) | <img height="20" src="https://i.imgur.com/usXedIj.png"/> | TaevasTV7.fi |
diff --git a/lists/finland.md b/lists/finland.md
index ada4139..b55661c 100644
--- a/lists/finland.md
+++ b/lists/finland.md
@@ -2,17 +2,17 @@
 
 | #   | Channel        | Link  | Logo | EPG id |
 |:---:|:--------------:|:-----:|:----:|:------:|
-| 1   | Yle TV1   Ⓖ | [>](https://yletv.akamaized.net/hls/live/622365/yletv1fin/index.m3u8) | <img height="20" src="https://i.imgur.com/Hkljcl8.png"/> | YleTV1.fi |
-| 2   | Yle TV2  Ⓖ | [>](https://yletv.akamaized.net/hls/live/622366/yletv2fin/index.m3u8) | <img height="20" src="https://i.imgur.com/nNElsFg.png"/> | YleTV2.fi |
+| 1   | Yle TV1   Ⓖ | [>](https://yletv.akamaized.net/hls/live/622365/yletv1fin/index.m3u8) | <img height="20" src="https://i.imgur.com/6yXZwUL.png"/> | YleTV1.fi |
+| 2   | Yle TV2  Ⓖ | [>](https://yletv.akamaized.net/hls/live/622366/yletv2fin/index.m3u8) | <img height="20" src="https://i.imgur.com/4xkc6PL.png"/> | YleTV2.fi |
 | 3   | MTV3   | [>](https://live-fi.tvkaista.net/mtv3/live.m3u8) | <img height="20" src="https://i.imgur.com/kNbmc8n.png"/> | MTV3.fi |
 | 5   | Yle Teema Fem  Ⓖ | [>](https://yletv.akamaized.net/hls/live/622367/yletvteemafemfin/index.m3u8) | <img height="20" src="https://i.imgur.com/iDljufz.png"/> | YleTeemaFem.fi |
 | 6   | MTV Sub  | [>](https://live-fi.tvkaista.net/sub/live.m3u8) | <img height="20" src="https://i.imgur.com/VRCuxQt.png"/> | Sub.fi |
-| 7   | TV5   | [>](https://live-fi.tvkaista.net/tv5/live.m3u8) | <img height="20" src="https://i.imgur.com/MoukyGs.png"/> | TV5.fi |
+| 7   | TV5  | [>](https://live-fi.tvkaista.net/tv5/live.m3u8) | <img height="20" src="https://i.imgur.com/MoukyGs.png"/> | TV5.fi |
 | 10   | Kutonen   | [>](https://live-fi.tvkaista.net/kutonen/live.m3u8) | <img height="20" src="https://i.imgur.com/4giVyxb.png"/> | Kutonen.fi |
-| 11   | TLC   | [>](https://live-fi.tvkaista.net/tlc/live.m3u8) | <img height="20" src="https://i.imgur.com/0d5hP3A.png"/> | TLCFinland.fi |
-| 13   | MTV Ava  | [>](https://live-fi.tvkaista.net/ava/live.m3u8) | <img height="20" src="https://i.imgur.com/rtyJVgB.png"/> | Ava.fi |
+| 11   | TLC Finland | [>](https://live-fi.tvkaista.net/tlc/live.m3u8) | <img height="20" src="https://i.imgur.com/0d5hP3A.png"/> | TLCFinland.fi |
+| 13   | MTV Ava  | [>](https://live-fi.tvkaista.net/ava/live.m3u8) | <img height="20" src="https://i.imgur.com/rtyJVgB.png"/> | AVA.fi |
 | 16   | Frii   | [>](https://live-fi.tvkaista.net/frii/live.m3u8) | <img height="20" src="https://i.imgur.com/ljKoG9I.png"/> | Frii.fi |
 | 19  | INEZ | [>](https://inezsecondary.digitacdn.net/live/_definst_/inez/amlst:inezlive.amlst/master.m3u8?organizationId=14520912&suiteItemId=14521292) | <img height="20" src="https://i.imgur.com/2QEWscr.png"/> | INEZ.fi |
-| 33  | Koti TV | [>](https://kotitv.digitacdn.net/amlst:kotitv.amlst/playlist.m3u8?organizationId=83459409&suiteItemId=83459780) | <img height="20" src="https://i.imgur.com/IgK0pJN.png"/> | KotiTV.fi |
+| 33  | OnniTV | [>](https://kotitv.digitacdn.net/amlst:kotitv.amlst/playlist.m3u8?organizationId=83459409&suiteItemId=83459780) | <img height="20" src="https://i.imgur.com/HzILf2H.png"/> | KotiTV.fi |
 | 45  | Taivas TV7 | [>](https://vod.tv7.fi/tv7-fi/_definst_/smil:tv7-fi.smil/playlist.m3u8) | <img height="20" src="https://i.imgur.com/a4iNVXA.png"/> | TaivasTV7.fi |
 | 46  | Himlen TV7 | [>](https://vod.tv7.fi/tv7-se/_definst_/smil:tv7-se.smil/playlist.m3u8) | <img height="20" src="https://i.imgur.com/a4iNVXA.png"/> | HimlenTV7.fi |