Index: master_iconmap.xml
===================================================================
--- master_iconmap.xml	(revision 12551)
+++ master_iconmap.xml	(working copy)
@@ -3090,7 +3090,7 @@
     </callsigntonetwork>
     <callsigntonetwork>
         <callsign>KWPX</callsign>
-        <network>ITV</network>
+        <network>ITV-KWPX</network>
     </callsigntonetwork>
     <callsigntonetwork>
         <callsign>KWQC</callsign>
@@ -4474,7 +4474,7 @@
     </callsigntonetwork>
     <callsigntonetwork>
         <callsign>WCPX</callsign>
-        <network>ITV</network>
+        <network>ITV-WCPX</network>
     </callsigntonetwork>
     <callsigntonetwork>
         <callsign>WCSH</callsign>
@@ -6686,7 +6686,7 @@
     </networktourl>
     <networktourl>
         <network>ABC-WLS</network>
-        <url>[ls-logo]/ww/wls_chicago_ch7.jpg</url>
+        <url>[ls-logo]/tv/ww/wls_chicago_ch7.jpg</url>
     </networktourl>
     <networktourl>
         <network>ABC-WPVI</network>
@@ -6822,7 +6822,7 @@
     </networktourl>
     <networktourl>
         <network>CBC-CBLFT</network>
-        <url>[ls-logo]/tv/cc/cblt_toronto.gif </url>
+        <url>[ls-logo]/tv/cc/cblt_toronto.jpg </url>
     </networktourl>
     <networktourl>
         <network>CBC-CBXFT</network>
@@ -6854,7 +6854,7 @@
     </networktourl>
     <networktourl>
         <network>CBS-WBBM</network>
-        <url>[ls-logo]/ww/wbbm_cbs2_chicago.jpg</url>
+        <url>[ls-logo]/tv/ww/wbbm_cbs2_chicago.jpg</url>
     </networktourl>
     <networktourl>
         <network>CBS-WIBW</network>
@@ -6926,7 +6926,7 @@
     </networktourl>
     <networktourl>
         <network>CSNCH</network>
-        <url>[ls-logo]/cc/comcast_sportsnet_baltimore.jpg</url>
+        <url>[ls-logo]/tv/cc/comcast_sportsnet_baltimore.jpg</url>
     </networktourl>
     <networktourl>
         <network>CSPAN</network>
@@ -7066,7 +7066,7 @@
     </networktourl>
     <networktourl>
         <network>EWTN</network>
-        <url>[ls-logo]/ee/ewtn.jpg</url>
+        <url>[ls-logo]/tv/ee/ewtn.jpg</url>
     </networktourl>
     <networktourl>
         <network>Encore</network>
@@ -7142,7 +7142,7 @@
     </networktourl>
     <networktourl>
         <network>FOX-WFLD</network>
-        <url>[ls-logo]/ww/wfld_fox32_chicago.jpg</url>
+        <url>[ls-logo]/tv/ww/wfld_fox32_chicago.jpg</url>
     </networktourl>
     <networktourl>
         <network>FOX-WOFL</network>
@@ -7206,7 +7206,7 @@
     </networktourl>
     <networktourl>
         <network>GALAVISION</network>
-        <url>[ls-logo]/gg/galavision_us.jpg</url>
+        <url>[ls-logo]/tv/gg/galavision_us.jpg</url>
     </networktourl>
     <networktourl>
         <network>GAMESHOWNETWORK</network>
@@ -7310,11 +7310,11 @@
     </networktourl>
     <networktourl>
         <network>IND-WCIU</network>
-        <url>[ls-logo]/ww/wciu_cbs26_chicago.jpg</url>
+        <url>[ls-logo]/tv/ww/wciu_cbs26_chicago.jpg</url>
     </networktourl>
     <networktourl>
         <network>IND-WJYS</network>
-        <url>[ls-logo]/ww/wjys62_chicago.jpg</url>
+        <url>[ls-logo]/tv/ww/wjys62_chicago.jpg</url>
     </networktourl>
     <networktourl>
         <network>IND-WLCB</network>
@@ -7350,9 +7350,17 @@
     </networktourl>
     <networktourl>
         <network>ITV</network>
-        <url>[ls-logo]/tv/kk/kwpx_i33_seattle.jp</url>
+        <url>[ls-logo]/tv/ii/independent_tv.jpg</url>
     </networktourl>
     <networktourl>
+        <network>ITV-KWPX</network>
+        <url>[ls-logo]/tv/kk/kwpx_i33_seattle.jpg</url>
+    </networktourl>
+    <networktourl>
+        <network>ITV-WCPX</network>
+        <url>[ls-logo]/tv/ww/wcpx_i38_chicago.jpg</url>
+    </networktourl>
+    <networktourl>
         <network>JCTV</network>
         <url>[ls-logo]/tv/jj/jc_tv.jpg</url>
     </networktourl>
@@ -7474,7 +7482,7 @@
     </networktourl>
     <networktourl>
         <network>MYTV-WPWR</network>
-        <url>[ls-logo]/ww/wpwr_my50_chicago.jpg</url>
+        <url>[ls-logo]/tv/ww/wpwr_my50_chicago.jpg</url>
     </networktourl>
     <networktourl>
         <network>MYTV-WRBW</network>
@@ -7542,7 +7550,7 @@
     </networktourl>
     <networktourl>
         <network>NBC-WMAQ</network>
-        <url>[ls-logo]/ww/wmaq_nbc5_chicago.jpg</url>
+        <url>[ls-logo]/tv/ww/wmaq_nbc5_chicago.jpg</url>
     </networktourl>
     <networktourl>
         <network>NEWSENG</network>
@@ -8538,7 +8546,7 @@
     </networktourl>
     <networktourl>
         <network>TELEMUNDO-WSNS</network>
-        <url>[ls-logo]/ww/wsns_telemundo44_chicago.jpg</url>
+        <url>[ls-logo]/tv/ww/wsns_telemundo44_chicago.jpg</url>
     </networktourl>
     <networktourl>
         <network>TELETOON-CA</network>
@@ -8594,7 +8602,7 @@
     </networktourl>
     <networktourl>
         <network>TVGUIDE</network>
-        <url>[ls-logo]/tt/tv_guide_channel.jpg</url>
+        <url>[ls-logo]/tv/tt/tv_guide_channel.jpg</url>
     </networktourl>
     <networktourl>
         <network>TVLAND</network>
@@ -8622,7 +8630,7 @@
     </networktourl>
     <networktourl>
         <network>TeleLatino</network>
-        <url>[ls-logo]/tt/tln_telelatino.jpg</url>
+        <url>[ls-logo]/tv/tt/tln_telelatino.jpg</url>
     </networktourl>
     <networktourl>
         <network>UNIVERSALHD</network>
@@ -8638,7 +8646,7 @@
     </networktourl>
     <networktourl>
         <network>UNIVISION-WGBO</network>
-        <url>[ls-logo]/uu/univision.jpg</url>
+        <url>[ls-logo]/tv/uu/univision.jpg</url>
     </networktourl>
     <networktourl>
         <network>UPN</network>
Index: data/callsigntonetwork.txt
===================================================================
--- data/callsigntonetwork.txt	(revision 12551)
+++ data/callsigntonetwork.txt	(working copy)
@@ -770,7 +770,7 @@
 KWKT        FOX
 KWNB        ABC
 KWOG        KWOG
-KWPX        ITV
+KWPX        ITV-KWPX
 KWQC        NBC
 KWSD        WB
 KWSU        PBS-KWSU
@@ -1116,7 +1116,7 @@
 WCNY        PBS-WCNY
 WCOV        FOX
 WCPO        ABC
-WCPX        ITV
+WCPX        ITV-WCPX
 WCSH        NBC
 WCTE        PBS-WCTE
 WCTI        ABC
Index: data/networktourl.txt
===================================================================
--- data/networktourl.txt	(revision 12551)
+++ data/networktourl.txt	(working copy)
@@ -2,7 +2,7 @@
 ABC-KMBC                [ls-logo]/tv/kk/kmbc_kansascity.jpg
 ABC-KTKA                [ls-logo]/tv/kk/ktka_abc49_topeka.jpg
 ABC-WFTV                [ls-logo]/tv/ww/wftv.jpg
-ABC-WLS                 [ls-logo]/ww/wls_chicago_ch7.jpg
+ABC-WLS                 [ls-logo]/tv/ww/wls_chicago_ch7.jpg
 ABC-WPVI                [ls-logo]/tv/ww/wpvi_abc6_philadelphia.jpg
 ABC2au                  [ls-logo]/tv/aa/abc2_au.jpg
 ABCFAMILY               [zap2it]/fam.jpg
@@ -36,7 +36,7 @@
 CANAL_RURAL-BR          [ls-logo]/tv/cc/canal_rural_brasil.jpg
 CARTOONNETWORK          [zap2it]/toon.gif
 CBC                     [ls-logo]/tv/cc/cbc_tv.jpg
-CBC-CBLFT               [ls-logo]/tv/cc/cblt_toronto.gif 
+CBC-CBLFT               [ls-logo]/tv/cc/cblt_toronto.jpg 
 CBC-CBXFT               [ls-logo]/tv/cc/cbc_src.jpg
 CBC-CBXT                [ls-logo]/tv/cc/cbc_edmonton.jpg
 CBC-NewsWorld           [ls-logo]/tv/cc/cbc_newsworld.jpg
@@ -44,7 +44,7 @@
 CBS-KCTV                [ls-logo]/tv/kk/kctv_tv5_kansas_city.jpg
 CBS-KREM                [ls-logo]/tv/kk/krem_cbs2_spokane.jpg
 CBS-KYW                 [ls-logo]/tv/kk/kyw_cbs3_philadelphia.jpg
-CBS-WBBM                [ls-logo]/ww/wbbm_cbs2_chicago.jpg
+CBS-WBBM                [ls-logo]/tv/ww/wbbm_cbs2_chicago.jpg
 CBS-WIBW                [ls-logo]/tv/ww/wibw_cbs13_topeka.jpg
 CBS-WKMG                [ls-logo]/tv/ww/wkmg_orlando.jpg
 CHURCHCHANNEL           [ls-logo]/tv/cc/church_channel.jpg
@@ -62,7 +62,7 @@
 COMEDYNETWORK           [ls-logo]/tv/cc/comedynetwork.jpg
 COURT                   [zap2it]/court.jpg
 CPAC                    [ls-logo]/tv/cc/cpac.jpg
-CSNCH                   [ls-logo]/cc/comcast_sportsnet_baltimore.jpg
+CSNCH                   [ls-logo]/tv/cc/comcast_sportsnet_baltimore.jpg
 CSPAN                   [zap2it]/cspan.jpg
 CSPAN2                  [zap2it]/cspan2.jpg
 CTV-CFRN                [ls-logo]/tv/cc/cfrn_edmonton.jpg
@@ -106,7 +106,7 @@
 Encore_Mystery          [ls-logo]/tv/ee/encore_mystery.jpg
 Encore_WAM              [ls-logo]/tv/ee/encore_wam.jpg
 Encore_Westerns         [ls-logo]/tv/ee/encore_westerns.jpg
-EWTN                    [ls-logo]/ee/ewtn.jpg
+EWTN                    [ls-logo]/tv/ee/ewtn.jpg
 ExpoChannel             [ls-logo]/tv/ee/expo_channel.jpg
 FITV                    [zap2it]/thn.gif
 FLIVING                 [ls-icon]/tv/ff/fineliving.gif
@@ -116,7 +116,7 @@
 FOX                     [zap2it]/fox.jpg
 FOX-KTMJ                [ls-logo]/tv/kk/ktmj_fox43_topeka.jpg
 FOX-WDAF                [ls-logo]/tv/ww/wdaf_kansascity.jpg
-FOX-WFLD                [ls-logo]/ww/wfld_fox32_chicago.jpg
+FOX-WFLD                [ls-logo]/tv/ww/wfld_fox32_chicago.jpg
 FOX-WOFL                [ls-logo]/tv/ww/wofl_fox35_orlando.jpg
 FOX-WTXF                [ls-logo]/tv/ww/wtxf_fox29_philadelphia.jpg
 FOXMOVIE                [ls-icon]/tv/ff/fox_moviechannel.gif
@@ -132,7 +132,7 @@
 FoxNewsChannel          [ls-logo]/tv/ff/foxnews.jpg
 FoxSportsNetwork        [ls-logo]/tv/ff/fsn.jpg
 G4                      [ls-icon]/tv/gg/g4_video_game_tv.gif
-GALAVISION              [ls-logo]/gg/galavision_us.jpg
+GALAVISION              [ls-logo]/tv/gg/galavision_us.jpg
 GAMESHOWNETWORK         [zap2it]/gameshownetwork.jpg
 GLOBAL-CHCA             [ls-logo]/tv/cc/chca_red_deer.jpg
 GLOBAL-CITV             [ls-logo]/tv/gg/global_edmonton.jpg
@@ -158,8 +158,8 @@
 IND-CFTM                [ls-logo]/tv/cc/cftm_montreal.jpg
 IND-TFO                 [ls-logo]/tv/tt/tfo.jpg
 IND-WACX                [ls-logo]/tv/ww/wacx_tv55_orlando.jpg
-IND-WCIU                [ls-logo]/ww/wciu_cbs26_chicago.jpg
-IND-WJYS                [ls-logo]/ww/wjys62_chicago.jpg
+IND-WCIU                [ls-logo]/tv/ww/wciu_cbs26_chicago.jpg
+IND-WJYS                [ls-logo]/tv/ww/wjys62_chicago.jpg
 IND-WLCB                [ls-logo]/tv/ww/wlcb_45_leesburg.jpg
 IND-WRDQ                [ls-logo]/tv/ww/wrdq_action27_orlando.jpg
 IND-WSBK                [ls-logo]/tv/ww/wsbk_tv38_boston.jpg
@@ -168,7 +168,9 @@
 IND-YTVP                [ls-logo]/tv/yy/youth_tv.jpg
 INHD                    [ls-icon]/tv/ii/inhd.gif
 IPLEX                   [ls-icon]/tv/ee/encore_indieplex.gif
-ITV                     [ls-logo]/tv/kk/kwpx_i33_seattle.jp
+ITV			[ls-logo]/tv/ii/independent_tv.jpg
+ITV-KWPX                [ls-logo]/tv/kk/kwpx_i33_seattle.jpg
+ITV-WCPX		[ls-logo]/tv/ww/wcpx_i38_chicago.jpg
 JCTV                    [ls-logo]/tv/jj/jc_tv.jpg
 JETIX                   [ls-logo]/tv/jj/jetix.jpg
 KBCB                    [ls-icon]/tv/kk/kbcb_24_world_tv_seattle.gif
@@ -199,7 +201,7 @@
 MULTISHOW-BR            [ls-logo]/tv/mm/multishow.jpg
 MUSIQUEPLUS             [ls-logo]/tv/mm/musiqueplus.jpg
 MYTV-WPHL               [ls-logo]/tv/ww/wphl_my17_philadelphia.jpg
-MYTV-WPWR               [ls-logo]/ww/wpwr_my50_chicago.jpg
+MYTV-WPWR               [ls-logo]/tv/ww/wpwr_my50_chicago.jpg
 MYTV-WRBW               [ls-logo]/tv/ww/wrbw_my65_orlando.jpg
 MYTV-WWOR               [ls-logo]/tv/ww/wwor_my9_secaucus.jpg
 MainEventPPV            [ls-logo]/tv/mm/mainevent_ppv.jpg
@@ -216,7 +218,7 @@
 NBC-WCAU                [ls-logo]/tv/ww/wcau_nbc10_philadelphia.jpg
 NBC-WCAU-WEATHERPLUS    [ls-logo]/tv/ww/wcau_weather_plus.jpg
 NBC-WESH                [ls-logo]/tv/ww/wesh_nbc2_daytona_beach.jpg
-NBC-WMAQ                [ls-logo]/ww/wmaq_nbc5_chicago.jpg
+NBC-WMAQ                [ls-logo]/tv/ww/wmaq_nbc5_chicago.jpg
 NEWSENG                 [zap2it]/necn.gif
 NFL                     [ls-icon]/tv/nn/nfl.gif
 NWCN                    [ls-icon]/tv/nn/nw_cablenews_can.gif
@@ -464,9 +466,9 @@
 TELECINE_PIPOCA-BR      [ls-logo]/tv/tt/telecine_pipoca.jpg
 TELECINE_PREMIUM-BR     [ls-logo]/tv/tt/telecine_premium.jpg
 TELEFUTURA              [ls-logo]/tv/tt/telefutura.jpg
-TeleLatino              [ls-logo]/tt/tln_telelatino.jpg
+TeleLatino              [ls-logo]/tv/tt/tln_telelatino.jpg
 TELEMUNDO               [zap2it2]/telemundo.gif
-TELEMUNDO-WSNS          [ls-logo]/ww/wsns_telemundo44_chicago.jpg
+TELEMUNDO-WSNS          [ls-logo]/tv/ww/wsns_telemundo44_chicago.jpg
 TELETOON-CA             [ls-logo]/tv/tt/teletoon_ca.jpg
 TFC-West                [ls-logo]/tv/ff/family.jpg
 THESCORE                [ls-logo]/tv/tt/the_score.jpg
@@ -480,7 +482,7 @@
 TUBE                    [ls-logo]/tv/tt/the_tube.jpg
 TV1au                   [ls-logo]/tv/tt/tv1_aus.jpg
 TV5                     [ls-logo]/tv/tt/tv5_quebec.jpg
-TVGUIDE                 [ls-logo]/tt/tv_guide_channel.jpg
+TVGUIDE                 [ls-logo]/tv/tt/tv_guide_channel.jpg
 TVLAND                  [zap2it]/tvland.jpg
 TVO-CICA                [ls-logo]/tv/cc/cica_tv_ontario.jpg
 TVONE                   [ls-logo]/tv/tt/tv_one_us.jpg
@@ -490,7 +492,7 @@
 UNIVERSALHD             [ls-logo]/tv/uu/universal_hd.jpg
 UNIVERSAL_CHANNEL       [ls-logo]/tv/uu/universal_channel.jpg
 UNIVISION               [zap2it]/uni.jpg
-UNIVISION-WGBO          [ls-logo]/uu/univision.jpg
+UNIVISION-WGBO          [ls-logo]/tv/uu/univision.jpg
 UPN                     [zap2it]/upn.jpg
 UPN-KCWE                [ls-logo]/tv/kk/kcwe_cw29_kansas_city.jpg
 USA                     [zap2it]/usa.jpg