diff --git a/cck/cckwiz/iniFiles/Branding_page1.ini b/cck/cckwiz/iniFiles/Branding_page1.ini
index 01f3ecd63443..62912bcc5215 100644
--- a/cck/cckwiz/iniFiles/Branding_page1.ini
+++ b/cck/cckwiz/iniFiles/Branding_page1.ini
@@ -49,7 +49,7 @@ Value=Animated Logo
 Start_x=0
 Start_y=32
 Width=407
-Height=115
+Height=133
 
 [Widget 563]
 Type=Text
@@ -78,7 +78,34 @@ Value=
 Start_x=80
 Start_y=57
 Width=230
-Height=15
+Height=14
+
+[Widget 2000]
+Type=Text
+Name=Text564
+Value=Logo Button Tooltip:
+Start_x=11
+Start_y=90
+Width=65
+Height=11
+
+[Widget 2001]
+Type=Text
+Name=Text565
+Value=Enter the tooltip that users will see when they mouse over the animated logo button.
+Start_x=11
+Start_y=75
+Width=275
+Height=10
+
+[Widget 2002]
+Type=EditBox
+Name=AnimatedLogoTooltip
+Value=
+Start_x=80
+Start_y=87
+Width=230
+Height=14
 
 [Widget 7]
 Type=DynamicText
@@ -86,9 +113,9 @@ Name=LargeAnimPath
 URLDisplayLength=78
 Value=
 Start_x=11
-Start_y=93
+Start_y=121
 Width=280
-Height=15
+Height=14
 
 [Widget 972]
 Type=DynamicText
@@ -96,16 +123,16 @@ Name=LargeStillPath
 URLDisplayLength=78
 Value=
 Start_x=11
-Start_y=125
+Start_y=148
 Width=280
-Height=15
+Height=14
 
 [Widget 845]
 Type=Button
 Name=Button1975
 Value=View File
 Start_x=300
-Start_y=93
+Start_y=117
 Width=40
 Height=14
 onCommand=OpenURL(%LargeAnimPath%)
@@ -115,7 +142,7 @@ Type=Button
 Name=Button1279
 Value=Choose File...
 Start_x=346
-Start_y=93
+Start_y=117
 Width=50
 Height=14
 onCommand=BrowseFile()
@@ -136,7 +163,7 @@ Type=Text
 Name=Text54
 Value=Path to Your Animated GIF File (32 x 32 pixels):
 Start_x=11
-Start_y=80
+Start_y=108
 Width=160
 Height=12
 
@@ -145,7 +172,7 @@ Type=Text
 Name=Text536
 Value=Path to Your At Rest GIF File (32 x 32 pixels):
 Start_x=11
-Start_y=112
+Start_y=135
 Width=160
 Height=12
 
@@ -154,7 +181,7 @@ Type=Button
 Name=Button198
 Value=View File
 Start_x=300
-Start_y=125
+Start_y=144
 Width=40
 Height=14
 onCommand=OpenURL(%LargeStillPath%)
@@ -165,7 +192,7 @@ Type=Button
 Name=Button1239
 Value=Choose File...
 Start_x=346
-Start_y=125
+Start_y=144
 Width=50
 Height=14
 onCommand=BrowseFile()
@@ -176,7 +203,7 @@ Type=Text
 Name=Text81
 Value=You can add an item to the Help Menu which provides a link to your online customer support page.
 Start_x=11
-Start_y=164
+Start_y=180
 Width=350
 Height=9
 
@@ -185,7 +212,7 @@ Type=Text
 Name=Text825
 Value=Menu Item Text:
 Start_x=11
-Start_y=175
+Start_y=191
 Width=199
 Height=10
 
@@ -194,7 +221,7 @@ Type=EditBox
 Name=HelpMenuCommandName
 Value=
 Start_x=11
-Start_y=185
+Start_y=201
 Width=258
 Height=14
 
@@ -203,7 +230,7 @@ Type=Button
 Name=Button119
 Value=Show Example
 Start_x=336
-Start_y=212
+Start_y=228
 Width=60
 Height=14
 onCommand=DisplayImage(help.ini)
@@ -213,7 +240,7 @@ Type=Text
 Name=Text82
 Value=Help Menu Item URL:
 Start_x=11
-Start_y=201
+Start_y=217
 Width=199
 Height=10
 
@@ -222,7 +249,7 @@ Type=EditBox
 Name=HelpMenuCommandURL
 Value=
 Start_x=11
-Start_y=211
+Start_y=227
 Width=257
 Height=14
 
@@ -231,6 +258,6 @@ Type=BoldGroup
 Name=GroupBox13
 Value=Help Menu
 Start_x=0
-Start_y=153
+Start_y=169
 Width=407
-Height=79
+Height=77
diff --git a/cck/cckwiz/iniFiles/Default.che b/cck/cckwiz/iniFiles/Default.che
index 113876827e11..55082247d21a 100644
--- a/cck/cckwiz/iniFiles/Default.che
+++ b/cck/cckwiz/iniFiles/Default.che
@@ -4,6 +4,7 @@ Include Internet Setup=0
 FTPLocation=ftp://
 OrganizationName=
 AnimatedLogoURL=http://home.netscape.com
+AnimatedLogoTooltip=Go to the Netscape home page
 LargeAnimPath=%Root%Configs\Default\Workspace\AnimLogo\animlogo32.gif
 LargeStillPath=%Root%Configs\Default\Workspace\AnimLogo\staticlogo32.gif
 CompanyName=
diff --git a/cck/cckwiz/iniFiles/MyIsp.che b/cck/cckwiz/iniFiles/MyIsp.che
index 85177e0dfa2d..800504969778 100644
--- a/cck/cckwiz/iniFiles/MyIsp.che
+++ b/cck/cckwiz/iniFiles/MyIsp.che
@@ -4,6 +4,7 @@ Include Internet Setup=0
 FTPLocation=ftp://
 OrganizationName=
 AnimatedLogoURL=http://home.netscape.com
+AnimatedLogoTooltip=Go to the Netscape home page
 LargeAnimPath=%Root%Configs\MyIsp\Workspace\AnimLogo\animlogo32.gif
 LargeStillPath=%Root%Configs\MyIsp\Workspace\AnimLogo\staticlogo32.gif
 CompanyName=MyIsp
diff --git a/cck/driver/cck.che b/cck/driver/cck.che
index 79b68bc71c4e..0ef4e01bea91 100644
--- a/cck/driver/cck.che
+++ b/cck/driver/cck.che
@@ -5,6 +5,7 @@ Include Internet Setup=0
 FTPLocation=ftp://
 OrganizationName=
 AnimatedLogoURL=http://home.netscape.com
+AnimatedLogoTooltip=Go to the Netscape home page
 LargeAnimPath=%Root%Configs\Default\Workspace\AnimLogo\animlogo32.gif
 LargeStillPath=%Root%Configs\Default\Workspace\AnimLogo\staticlogo32.gif
 CompanyName=
diff --git a/cck/ib/script_Mac OS.ib b/cck/ib/script_Mac OS.ib
index 575290e36b51..0eb9e1b48b8e 100644
--- a/cck/ib/script_Mac OS.ib	
+++ b/cck/ib/script_Mac OS.ib	
@@ -20,13 +20,13 @@ modifyProperties(ChromeDefaults.zip,chrome/%REGION%.jar,locale/%REGION%/aim-regi
 modifyProperties(ChromeDefaults.zip,chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,messenger.throbber.url,%AnimatedLogoURL%)
 modifyProperties(ChromeDefaults.zip,chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,compose.throbber.url,%AnimatedLogoURL%)
 modifyProperties(ChromeDefaults.zip,chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,addressbook.throbber.url,%AnimatedLogoURL%)
-modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/App.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/chatContent.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/IM.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/editor/editorOverlay.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/messenger.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/addressbook/abMainWindow.dtd,throbber.tooltip,%AnimatedLogoURL%)
+modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/App.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/chatContent.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/IM.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/editor/editorOverlay.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/messenger.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(ChromeDefaults.zip,chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/addressbook/abMainWindow.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
 modifyJS(ChromeDefaults.zip,no.jar,defaults/pref/all-ns.js,general.useragent.vendorComment,%OrganizationName%)
 modifyJS1(ChromeDefaults.zip,no.jar,defaults/pref/all.js,network.proxy.ftp,%FTPproxyname%)
 modifyJS1(ChromeDefaults.zip,no.jar,defaults/pref/all.js,network.proxy.gopher,%Gopherproxyname%)
diff --git a/cck/ib/script_Windows.ib b/cck/ib/script_Windows.ib
index 63afb1282525..306ceb2c2949 100644
--- a/cck/ib/script_Windows.ib
+++ b/cck/ib/script_Windows.ib
@@ -28,13 +28,13 @@ modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/aim-reg
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,messenger.throbber.url,%AnimatedLogoURL%)
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,compose.throbber.url,%AnimatedLogoURL%)
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,addressbook.throbber.url,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/App.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/chatContent.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/IM.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/editor/editorOverlay.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/messenger.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/addressbook/abMainWindow.dtd,throbber.tooltip,%AnimatedLogoURL%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/App.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/chatContent.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/IM.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/editor/editorOverlay.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/messenger.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/addressbook/abMainWindow.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
 modifyJS(browser.xpi,no.jar,bin/defaults/pref/all-ns.js,general.useragent.vendorComment,%OrganizationName%)
 modifyJS1(browser.xpi,no.jar,bin/defaults/pref/all.js,network.proxy.ftp,%FTPproxyname%)
 modifyJS1(browser.xpi,no.jar,bin/defaults/pref/all.js,network.proxy.gopher,%Gopherproxyname%)
diff --git a/cck/ib/script_linux.ib b/cck/ib/script_linux.ib
index 5fdf34f52ba9..1190f4a926e3 100644
--- a/cck/ib/script_linux.ib
+++ b/cck/ib/script_linux.ib
@@ -20,13 +20,13 @@ modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/aim-reg
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,messenger.throbber.url,%AnimatedLogoURL%)
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,compose.throbber.url,%AnimatedLogoURL%)
 modifyProperties(reg%region%.xpi,bin/chrome/%REGION%.jar,locale/%REGION%/messenger-region/region-ns.properties,addressbook.throbber.url,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/App.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/chatContent.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/IM.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/editor/editorOverlay.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/messenger.dtd,throbber.tooltip,%AnimatedLogoURL%)
-modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/addressbook/abMainWindow.dtd,throbber.tooltip,%AnimatedLogoURL%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/App.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/chatContent.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/aim/IM.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/navigator/navigator.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/editor/editorOverlay.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/messenger.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
+modifyDTD(lang%lang%%region%.xpi,bin/chrome/%lang%-%REGION%.jar,locale/%lang%-%REGION%/messenger/addressbook/abMainWindow.dtd,throbber.tooltip,%AnimatedLogoTooltip%)
 modifyJS(browser.xpi,no.jar,bin/defaults/pref/all-ns.js,general.useragent.vendorComment,%OrganizationName%)
 modifyJS1(browser.xpi,no.jar,bin/defaults/pref/all.js,network.proxy.ftp,%FTPproxyname%)
 modifyJS1(browser.xpi,no.jar,bin/defaults/pref/all.js,network.proxy.gopher,%Gopherproxyname%)