Index: contrib/master_iconmap/data/baseurl.txt
===================================================================
--- contrib/master_iconmap/data/baseurl.txt	(revision 11166)
+++ contrib/master_iconmap/data/baseurl.txt	(working copy)
@@ -1,5 +1,5 @@
-ls-icon     http://lyngsat-logo.com/icon/tv/
-ls-logo     http://lyngsat-logo.com/logo/tv/
+ls-icon     http://lyngsat-logo.com/icon/tv
+ls-logo     http://lyngsat-logo.com/logo/tv
 pbs         http://www.pbs.org/images/stations/standard
 zap2it      http://images.zap2it.com/station_logo
-zap2it2     http://tvlistings2.zap2it.com/tms_network_logos/
+zap2it2     http://tvlistings2.zap2it.com/tms_network_logos
Index: contrib/master_iconmap/data/callsigntonetwork.txt
===================================================================
--- contrib/master_iconmap/data/callsigntonetwork.txt	(revision 11166)
+++ contrib/master_iconmap/data/callsigntonetwork.txt	(working copy)
@@ -568,7 +568,7 @@
 KTGM        ABC
 KTIV        UPN
 KTKA        ABC
-KTLA        WB
+KTLA        CW-KTLA
 KTMF        ABC
 KTMJ        FOX
 KTNE        PBS-KTNE
@@ -664,7 +664,7 @@
 KWCV        WB
 KWES        NBC
 KWFT        WB
-KWGN        WB
+KWGN        CW-KWGN
 KWIB        WB
 KWKB        WB
 KWKT        FOX
@@ -828,6 +828,7 @@
 WABG        ABC
 WABM        UPN
 WACH        FOX
+WACX        IND-WACX
 WACY        UPN
 WAFF        NBC
 WAGA        FOX
@@ -973,7 +974,7 @@
 WEMT        FOX
 WENH        PBS-WENH
 WENY        ABC
-WESH        NBC
+WESH        NBC-WESH
 WESTERN     Encore_Westerns
 WESTERNP    Encore_Westerns
 WETA        PBS-WETA
@@ -999,7 +1000,7 @@
 WFTC        UPN
 WFTE        UPN
 WFTS        ABC
-WFTV        ABC
+WFTV        ABC-WFTV
 WFTX        FOX
 WFUM        PBS-WFUM
 WFWA        PBS-WFWA
@@ -1028,7 +1029,7 @@
 WGGB        ABC
 WGHP        FOX
 WGMB        FOX
-WGN         WB
+WGN         CW-WGN
 WGNM        UPN
 WGNO        ABC
 WGNSAT      WB
@@ -1098,11 +1099,12 @@
 WKAR        PBS-WKAR
 WKBD        UPN
 WKBW        ABC
-WKCF        WB
+WKCF        CW-WKCF
 WKDH        ABC
 WKEF        ABC
 WKGB        PBS-WKGB
 WKJG        NBC
+WKMG        CBS-WKMG
 WKNO        PBS-WKNO
 WKOP        PBS-WKOP
 WKOW        ABC
@@ -1117,6 +1119,7 @@
 WLAX        FOX
 WLBT        NBC
 WLBZ        NBC
+WLCB        IND-WLCB
 WLCW        UPN
 WLEX        NBC
 WLFL        WB
@@ -1199,7 +1202,7 @@
 WOAI        NBC
 WOAY        ABC
 WOCO        ABC
-WOFL        FOX
+WOFL        FOX-WOFL
 WOGX        FOX
 WOHB        UPN
 WOHL        FOX
@@ -1211,6 +1214,7 @@
 WOMAX       CINEMAX
 WOMENP      SHOWTIME
 WOOD        NBC
+WOPX        PAX-WOPX
 WOSU        PBS-WOSU
 WOTV        ABC
 WOUB        PBS-WOUB
@@ -1226,7 +1230,7 @@
 WPGH        FOX
 WPGX        FOX
 WPHL        WB
-WPIX        WB
+WPIX        CW-WPIX
 WPLG        ABC
 WPME        UPN
 WPMI        NBC
@@ -1257,10 +1261,11 @@
 WQWQ        UPN
 WRAZ        FOX
 WRBU        UPN
-WRBW        UPN
+WRBW        MYTV-WRBW
 WRC         NBC
 WRCB        NBC
 WRDC        UPN
+WRDQ        IND-WRDQ
 WREX        NBC
 WRGT        FOX
 WRIC        ABC
@@ -1275,7 +1280,7 @@
 WSAZ        NBC
 WSB         ABC
 WSBE        PBS-WSBE
-WSBK        UPN
+WSBK        IND-WSBK
 WSEC        PBS-WSEC
 WSEE        CBS
 WSET        ABC
@@ -1309,6 +1314,7 @@
 WTCI        PBS-WTCI
 WTCN        WB
 WTEN        ABC
+WTGL        IND-WTGL
 WTGS        FOX
 WTHI        UPN
 WTHR        NBC
@@ -1402,7 +1408,7 @@
 WWJ         CBS
 WWLP        NBC
 WWMB        UPN
-WWOR        UPN
+WWOR        MYTV-WWOR
 WWSB        ABC
 WWTI        ABC
 WWWB        WB
Index: contrib/master_iconmap/data/networktourl.txt
===================================================================
--- contrib/master_iconmap/data/networktourl.txt	(revision 11166)
+++ contrib/master_iconmap/data/networktourl.txt	(working copy)
@@ -1,4 +1,5 @@
 ABC                     [zap2it]/abc.jpg
+ABC-WFTV                [ls-logo]/ww/wftv.jpg
 ABCFAMILY               [zap2it]/fam.jpg
 AE                      [zap2it]/aetv.jpg
 AMC                     [zap2it]/amc.gif
@@ -14,6 +15,7 @@
 CARTOONNETWORK          [zap2it]/toon.gif
 CBC                     [zap2it2]/cbc.gif
 CBS                     [zap2it]/cbs.jpg
+CBS-WKMG                [ls-logo]/ww/wkmg_orlando.jpg
 CINEMAX                 [zap2it]/max.jpg
 CMTV                    [zap2it]/cmtv.gif
 CNBC                    [zap2it]/cnbc.jpg
@@ -23,6 +25,11 @@
 COURT                   [zap2it]/court.jpg
 CSPAN                   [zap2it]/cspan.jpg
 CSPAN2                  [zap2it]/cspan2.jpg
+CW-KTLA                 [ls-logo]/kk/ktla.jpg
+CW-KWGN                 [ls-logo]/kk/kwgn_cw2_denver.jpg
+CW-WGN                  [ls-logo]/ww/wgn_cw9_chicago.jpg
+CW-WKCF                 [ls-logo]/ww/wkcf_cw18_clermont.jpg
+CW-WPIX                 [ls-logo]/ww/wpix_cw11_new_york.jpg
 DISCOVERY               [zap2it]/dsc.jpg
 DISCOVERYHD             [ls-icon]/dd/discovery_hd.gif
 DISNEY                  [zap2it]/disn.jpg
@@ -47,6 +54,7 @@
 FLIX                    [zap2it2]/flix.jpg
 FOOD                    [zap2it]/food.jpg
 FOX                     [zap2it]/fox.jpg
+FOX-WOFL                [ls-logo]/ww/wofl_fox35_orlando.jpg
 FOXMOVIE                [ls-icon]/ff/fox_moviechannel.gif
 FOXNEWS                 [zap2it]/fnc.gif
 FOXSPORTS               [zap2it]/foxsports.jpg
@@ -70,6 +78,11 @@
 HOMESHOPPINGNETWORK     [zap2it]/hsn.jpg
 IFC                     [ls-icon]/ii/ifc_us.gif
 INHD                    [ls-icon]/ii/inhd.gif
+IND-WACX                [ls-logo]/ww/wacx_tv55_orlando.jpg
+IND-WLCB                [ls-logo]/ww/wlcb_45_leesburg.jpg
+IND-WRDQ                [ls-logo]/ww/wrdq_action27_orlando.jpg
+IND-WSBK                [ls-logo]/ww/wsbk_tv38_boston.jpg
+IND-WTGL                [ls-logo]/ww/wtgl_52_cocoa.jpg
 IPLEX                   [ls-icon]/ee/encore_indieplex.gif
 KMEX                    [zap2it]/uni.gif
 KONG                    [ls-icon]/kk/kong6_16_seattle.gif
@@ -79,9 +92,12 @@
 MSNBC                   [zap2it]/msnbc.jpg
 MTV                     [zap2it]/mtv.jpg
 MTV2                    [zap2it]/mtv2.gif
+MYTV-WRBW               [ls-logo]/ww/wrbw_my65_orlando.jpg
+MYTV-WWOR               [ls-logo]/ww/wwor_my9_secaucus.jpg
 Military                [ls-logo]/mm/military_channel_discovery.jpg
 NASA                    [ls-icon]/nn/nasatv_us.gif
 NBC                     [zap2it]/nbc.jpg
+NBC-WESH                [ls-logo]/ww/wesh_nbc2_daytona_beach.jpg
 NEWSENG                 [zap2it]/necn.gif
 NFL                     [ls-icon]/nn/nfl.gif
 NWCN                    [ls-icon]/nn/nw_cablenews_can.gif
@@ -92,6 +108,7 @@
 OLN                     [zap2it]/oln.gif
 OXYGEN                  [ls-icon]/oo/oxygen.gif
 PAX                     [zap2it]/pax.jpg
+PAX-WOPX                [ls-logo]/ww/wopx_pax56_orlando.jpg
 PAXSAT                  [zap2it]/pax.jpg
 PBS                     [zap2it]/pbs.jpg
 PBS-KAET                [pbs]/KAET.gif