Icon updates

49 files changed, 34 insertions, 24 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/clear_co.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/clear_co.gif
index 99283d758..255832653 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/clear_co.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/clear_co.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/filter_history.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/filter_history.gif
new file mode 100644
index 000000000..1492b4efa
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/filter_history.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/newstream_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/newstream_wiz.gif
index b4c93b76f..fffccf7a7 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/newstream_wiz.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/clcl16/newstream_wiz.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/ctool16/checkout.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/ctool16/checkout.gif
index 012832b00..1409330d8 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/ctool16/checkout.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/ctool16/checkout.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/ctool16/contents.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/ctool16/contents.gif
new file mode 100644
index 000000000..133140dc6
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/ctool16/contents.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/console_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/console_view.gif
index e6d5b138d..90dc82f93 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/console_view.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/console_view.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/cvs_persp.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/cvs_persp.gif
new file mode 100644
index 000000000..1409330d8
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/cvs_persp.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/history_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/history_view.gif
index 548228be1..2da13357e 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/history_view.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/history_view.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/repo_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/repo_rep.gif
index 6c8fd5f18..62fb72a17 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/repo_rep.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/cview16/repo_rep.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/branches_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/branches_rep.gif
index 119c36c6b..21cc9f7b0 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/branches_rep.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/branches_rep.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/prjversions_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/prjversions_rep.gif
index 30a989907..72258bdef 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/prjversions_rep.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/prjversions_rep.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/repository_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/repository_rep.gif
index 012832b00..e28b524fb 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/repository_rep.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/repository_rep.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/versions_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/versions_rep.gif
index 954c7c44a..9b55c268c 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/versions_rep.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/obj16/versions_rep.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/confauto_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/confauto_ov.gif
index eee82ca2e..fcbf1ac2a 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/confauto_ov.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/confauto_ov.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/merged_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/merged_ov.gif
index 25765a163..154e35768 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/merged_ov.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/merged_ov.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/question_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/question_ov.gif
new file mode 100644
index 000000000..730a66813
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/ovr16/question_ov.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newconnect_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newconnect_wiz.gif
index f3d2a4d59..ead6e3cc4 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newconnect_wiz.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newconnect_wiz.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newlocation_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newlocation_wiz.gif
index b0f400d15..81483819d 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newlocation_wiz.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizards/newlocation_wiz.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/createpatch_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/createpatch_wizban.gif
new file mode 100644
index 000000000..362921851
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/createpatch_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/keywordsub_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/keywordsub_wizban.gif
new file mode 100644
index 000000000..d2974ebde
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/keywordsub_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gif
index dcba98c3e..147335887 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/mergestream_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gif
index 6a40323ff..b4314dec2 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newconnect_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newlocation_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newlocation_wizban.gif
new file mode 100644
index 000000000..8f6b2dfca
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newlocation_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gif
index e177a11f7..339e7dd8c 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/basic/wizban/newstream_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/checkout.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/checkout.gif
index 012832b00..1409330d8 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/checkout.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/checkout.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/contents.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/contents.gif
index 96c471776..133140dc6 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/contents.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/ctool16/contents.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/console_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/console_view.gif
index e6d5b138d..90dc82f93 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/console_view.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/console_view.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/cvs_persp.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/cvs_persp.gif
index 0719a5094..1409330d8 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/cvs_persp.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/cvs_persp.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/history_view.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/history_view.gif
index 548228be1..2da13357e 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/history_view.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/history_view.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/repo_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/repo_rep.gif
index 6c8fd5f18..62fb72a17 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/repo_rep.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/cview16/repo_rep.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/repository_rep.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/repository_rep.gif
index 012832b00..e28b524fb 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/repository_rep.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/obj16/repository_rep.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/confauto_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/confauto_ov.gif
index eee82ca2e..fcbf1ac2a 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/confauto_ov.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/confauto_ov.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/merged_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/merged_ov.gif
index 25765a163..154e35768 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/merged_ov.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/merged_ov.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/question_ov.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/question_ov.gif
new file mode 100644
index 000000000..730a66813
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/ovr16/question_ov.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newconnect_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newconnect_wiz.gif
index f3d2a4d59..ead6e3cc4 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newconnect_wiz.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newconnect_wiz.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newlocation_wiz.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newlocation_wiz.gif
index b0f400d15..81483819d 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newlocation_wiz.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizards/newlocation_wiz.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/createpatch_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/createpatch_wizban.gif
new file mode 100644
index 000000000..362921851
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/createpatch_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/keywordsub_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/keywordsub_wizban.gif
new file mode 100644
index 000000000..d2974ebde
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/keywordsub_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif
index 3038a23c0..b4314dec2 100644
--- a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newconnect_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newlocation_wizban.gif b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newlocation_wizban.gif
new file mode 100644
index 000000000..8f6b2dfca
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/icons/full/wizban/newlocation_wizban.gif
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
index 24dd41f06..dea3cd3a9 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIPlugin.java
@@ -295,6 +295,9 @@ public class CVSUIPlugin extends AbstractUIPlugin implements IPropertyChangeList
 		createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_BRANCH, baseURL);
 		createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_MERGE, baseURL);
 		createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE, baseURL);
+		createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF, baseURL);
+		createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_KEYWORD, baseURL);
+		createImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION, baseURL);
 		createImageDescriptor(ICVSUIConstants.IMG_MERGEABLE_CONFLICT, baseURL);
 		createImageDescriptor(ICVSUIConstants.IMG_QUESTIONABLE, baseURL);
 		createImageDescriptor(ICVSUIConstants.IMG_MERGED, baseURL);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
index 142a9f737..b5e09da99 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ICVSUIConstants.java
@@ -81,7 +81,10 @@ public interface ICVSUIConstants {
 	public final String IMG_WIZBAN_SHARE = "wizban/newconnect_wizban.gif";	 //$NON-NLS-1$
 	public final String IMG_WIZBAN_BRANCH = "wizban/newstream_wizban.gif";	 //$NON-NLS-1$
 	public final String IMG_WIZBAN_MERGE = "wizban/mergestream_wizban.gif";	 //$NON-NLS-1$
-
+	public final String IMG_WIZBAN_DIFF = "wizban/createpatch_wizban.gif";   //$NON-NLS-1$
+	public final String IMG_WIZBAN_KEYWORD = "wizban/keywordsub_wizban.gif"; //$NON-NLS-1$
+	public final String IMG_WIZBAN_NEW_LOCATION = "wizban/newlocation_wizban.gif"; //$NON-NLS-1$
+	
 	// Properties
 	public final String PROP_NAME = "cvs.name"; //$NON-NLS-1$
 	public final String PROP_REVISION = "cvs.revision"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
index a192fd944..b20a368ed 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileWizard.java
@@ -49,6 +49,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.team.internal.ccvs.core.client.Diff;
 import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
 import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
 import org.eclipse.team.internal.ccvs.ui.Policy;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.internal.misc.ContainerContentProvider;
@@ -92,8 +93,8 @@ public class GenerateDiffFileWizard extends Wizard {
 		private static final int SIZING_SELECTION_PANE_HEIGHT = 125;
 		private static final int SIZING_SELECTION_PANE_WIDTH = 200;
 		
-		PatchFileSelectionPage(String pageName, IStructuredSelection selection) {
-			super(pageName);
+		PatchFileSelectionPage(String pageName, String title, ImageDescriptor image, IStructuredSelection selection) {
+			super(pageName, title, image);
 			this.currentSelection = selection;
 			setPageComplete(false);
 		}
@@ -442,18 +443,16 @@ public class GenerateDiffFileWizard extends Wizard {
 	}
 
 	public void addPages() {
-		String pageTitle =Policy.bind("GenerateCVSDiff.pageTitle"); //$NON-NLS-1$
+		String pageTitle = Policy.bind("GenerateCVSDiff.pageTitle"); //$NON-NLS-1$
 		String pageDescription = Policy.bind("GenerateCVSDiff.pageDescription"); //$NON-NLS-1$
-		mainPage = new PatchFileSelectionPage(pageTitle, selection);
+		mainPage = new PatchFileSelectionPage(pageTitle, pageTitle, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF), selection);
 		mainPage.setDescription(pageDescription);
-		mainPage.setTitle(pageTitle);
 		addPage(mainPage);
 		
 		pageTitle = Policy.bind("Advanced_options_19"); //$NON-NLS-1$
 		pageDescription = Policy.bind("Configure_the_options_used_for_the_CVS_diff_command_20"); //$NON-NLS-1$
-		optionsPage = new PatchFileCreationOptionsPage(pageTitle);
+		optionsPage = new PatchFileCreationOptionsPage(pageTitle, pageTitle, CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_DIFF));
 		optionsPage.setDescription(pageDescription);
-		optionsPage.setTitle(pageTitle);
 		addPage(optionsPage);		
 	}
 		
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java
index aaf35a7c6..1e9c17944 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizard.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.custom.BusyIndicator;
@@ -36,6 +37,7 @@ import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
 import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
 import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
 import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
+import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
 import org.eclipse.team.internal.ccvs.ui.Policy;
 
 /**
@@ -127,10 +129,12 @@ public class KSubstWizard extends Wizard {
 	}
 
 	public void addPages() {
+		ImageDescriptor substImage = CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_KEYWORD);
+		
 		// add main page
 		String pageTitle = Policy.bind("KSubstWizardSelectionPage.pageTitle"); //$NON-NLS-1$
 		String pageDescription = Policy.bind("KSubstWizardSelectionPage.pageDescription"); //$NON-NLS-1$
-		mainPage = new KSubstWizardSelectionPage(pageTitle, defaultKSubst);
+		mainPage = new KSubstWizardSelectionPage(pageTitle, pageTitle, substImage, defaultKSubst);
 		mainPage.setDescription(pageDescription);
 		mainPage.setTitle(pageTitle);
 		addPage(mainPage);
@@ -138,25 +142,22 @@ public class KSubstWizard extends Wizard {
 		// add summary page
 		pageTitle = Policy.bind("KSubstWizardSummaryPage.pageTitle"); //$NON-NLS-1$
 		pageDescription = Policy.bind("KSubstWizardSummaryPage.pageDescription"); //$NON-NLS-1$
-		summaryPage = new KSubstWizardSummaryPage(pageTitle, false);
+		summaryPage = new KSubstWizardSummaryPage(pageTitle, pageTitle, substImage, false);
 		summaryPage.setDescription(pageDescription);
-		summaryPage.setTitle(pageTitle);
 		addPage(summaryPage);
 		
 		// add shared files warning page
 		pageTitle = Policy.bind("KSubstWizardSharedFilesPage.pageTitle"); //$NON-NLS-1$
 		pageDescription = Policy.bind("KSubstWizardSharedFilesPage.pageDescription"); //$NON-NLS-1$
-		sharedFilesPage = new KSubstWizardSharedFilesPage(pageTitle, false);
+		sharedFilesPage = new KSubstWizardSharedFilesPage(pageTitle, pageTitle, substImage, false);
 		sharedFilesPage.setDescription(pageDescription);
-		sharedFilesPage.setTitle(pageTitle);
 		addPage(sharedFilesPage);
 		
 		// add changed files warning page
 		pageTitle = Policy.bind("KSubstWizardDirtyFilesPage.pageTitle"); //$NON-NLS-1$
 		pageDescription = Policy.bind("KSubstWizardDirtyFilesPage.pageDescription"); //$NON-NLS-1$
-		dirtyFilesPage = new KSubstWizardDirtyFilesPage(pageTitle, false);
+		dirtyFilesPage = new KSubstWizardDirtyFilesPage(pageTitle, pageTitle, substImage, false);
 		dirtyFilesPage.setDescription(pageDescription);
-		dirtyFilesPage.setTitle(pageTitle);
 		addPage(dirtyFilesPage);		
 	}
 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
index b0686d396..15452e3bf 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardDirtyFilesPage.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
@@ -27,8 +28,8 @@ public class KSubstWizardDirtyFilesPage extends CVSWizardPage {
 	private Button includeDirtyFilesButton;
 	private ListViewer listViewer;
 
-	public KSubstWizardDirtyFilesPage(String pageName, boolean includeDirtyFiles) {
-		super(pageName);
+	public KSubstWizardDirtyFilesPage(String pageName, String title, ImageDescriptor image, boolean includeDirtyFiles) {
+		super(pageName, title, image);
 		this.includeDirtyFiles = includeDirtyFiles;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
index afca150a4..3707688e8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSelectionPage.java
@@ -10,6 +10,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -35,8 +36,8 @@ public class KSubstWizardSelectionPage extends CVSWizardPage {
 	private Button ksubstRadioButton;
 	private Combo ksubstOptionCombo;
 
-	public KSubstWizardSelectionPage(String pageName, KSubstOption defaultKSubst) {
-		super(pageName);
+	public KSubstWizardSelectionPage(String pageName, String title, ImageDescriptor image, KSubstOption defaultKSubst) {
+		super(pageName, title, image);
 		this.ksubst = defaultKSubst;
 
 		// sort the options by display text
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
index a527b0389..435f73975 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSharedFilesPage.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
@@ -28,8 +29,8 @@ public class KSubstWizardSharedFilesPage extends CVSWizardPage {
 	private Button includeSharedFilesButton;
 	private ListViewer listViewer;
 
-	public KSubstWizardSharedFilesPage(String pageName, boolean includeSharedFiles) {
-		super(pageName);
+	public KSubstWizardSharedFilesPage(String pageName, String title, ImageDescriptor image, boolean includeSharedFiles) {
+		super(pageName, title, image);
 		this.includeSharedFiles = includeSharedFiles;
 	}
 	
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
index be787ab4c..42f2964c2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/KSubstWizardSummaryPage.java
@@ -10,6 +10,7 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.CheckStateChangedEvent;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
@@ -50,8 +51,8 @@ public class KSubstWizardSummaryPage extends CVSWizardPage {
 	private Button showUnaffectedFilesButton;
 	private boolean showUnaffectedFiles;
 
-	public KSubstWizardSummaryPage(String pageName, boolean showUnaffectedFiles) {
-		super(pageName);
+	public KSubstWizardSummaryPage(String pageName, String title, ImageDescriptor image, boolean showUnaffectedFiles) {
+		super(pageName, title, image);
 		this.showUnaffectedFiles = showUnaffectedFiles;
 
 		// sort the options by display text
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
index 870a6ac5c..d0131d891 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/NewLocationWizard.java
@@ -49,7 +49,7 @@ public class NewLocationWizard extends Wizard {
 	 * Creates the wizard pages
 	 */
 	public void addPages() {
-		mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.heading"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_SHARE)); //$NON-NLS-1$ //$NON-NLS-2$
+		mainPage = new ConfigurationWizardMainPage("repositoryPage1", Policy.bind("NewLocationWizard.heading"), CVSUIPlugin.getPlugin().getImageDescriptor(ICVSUIConstants.IMG_WIZBAN_NEW_LOCATION)); //$NON-NLS-1$ //$NON-NLS-2$
 		if (properties != null) {
 			mainPage.setProperties(properties);
 		}