diff --git a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st
index 5a19df5eec..7934afd4cd 100644
--- a/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st
+++ b/Iceberg-Plugin-GitHub/IceGitHubAcceptPullRequestModel.class.st
@@ -66,11 +66,11 @@ IceGitHubAcceptPullRequestModel >> initialExtentForWindow [
 IceGitHubAcceptPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [
 	
 	aDialogWindowPresenter
-		addButton: 'Accept' do: [ :presenter | 
-			self accept ];
 		addButton: 'Cancel' do: [ :presenter | 
 			presenter triggerCancelAction.
-			presenter close ]	
+			presenter close ];
+		addDefaultButton: 'Accept' do: [ :presenter | 
+			self accept ]
 ]
 
 { #category : 'initialization' }
diff --git a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st
index a3cd63eb2e..5d0be11000 100644
--- a/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st
+++ b/Iceberg-Plugin-GitHub/IceGitHubCreatePullRequestModel.class.st
@@ -254,11 +254,12 @@ IceGitHubCreatePullRequestModel >> initialExtentForWindow [
 IceGitHubCreatePullRequestModel >> initializeDialogWindow: aWindow [
 
 	aWindow
-		addButton: 'Create' do: [ 
-			self accept ];
 		addButton: 'Cancel' do: [ :presenter | 
 			presenter triggerCancelAction.
-			presenter close ]			
+			presenter close ];
+		addDefaultButton: 'Create' do: [ 
+			self accept ]
+
 ]
 
 { #category : 'initialization' }
diff --git a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st
index 29d86d03e1..2ff980871a 100644
--- a/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st
+++ b/Iceberg-Plugin-GitHub/IceGitHubRejectPullRequestModel.class.st
@@ -62,11 +62,11 @@ IceGitHubRejectPullRequestModel >> initialExtentForWindow [
 IceGitHubRejectPullRequestModel >> initializeDialogWindow: aDialogWindowPresenter [
 
 	aDialogWindowPresenter
-		addButton: 'Reject' do: [ :presenter | 
-			presenter triggerOkAction.
-			presenter close ];
 		addButton: 'Cancel' do: [ :presenter | 
 			presenter triggerCancelAction.
+			presenter close ];
+		addDefaultButton: 'Reject' do: [ :presenter | 
+			presenter triggerOkAction.
 			presenter close ]
 ]
 
diff --git a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st
index fc8e1b1965..79841ebbb5 100644
--- a/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st
+++ b/Iceberg-Plugin-GitHub/IceGitHubRemoveBranchesModel.class.st
@@ -55,12 +55,12 @@ IceGitHubRemoveBranchesModel >> initialize [
 IceGitHubRemoveBranchesModel >> initializeDialogWindow: aDialogWindowPresenter [
 
 	aDialogWindowPresenter
-		addButton: 'Remove' do: [ :presenter | 
-			self triggerAcceptAction.
-			presenter close ];
 		addButton: 'Cancel' do: [ :presenter | 
 			presenter triggerCancelAction.
-			presenter close ]	
+			presenter close ];
+		addDefaultButton: 'Remove' do: [ :presenter | 
+			self triggerAcceptAction.
+			presenter close ]		
 ]
 
 { #category : 'initialization' }
diff --git a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st
index ff95d0bfdc..e73ca98441 100644
--- a/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st
+++ b/Iceberg-TipUI/IceTipAbstractCredentialsPresenter.class.st
@@ -113,14 +113,14 @@ IceTipAbstractCredentialsPresenter >> initialize [
 	accepted := false
 ]
 
-{ #category : 'accessing' }
+{ #category : 'initialization' }
 IceTipAbstractCredentialsPresenter >> initializeDialogWindow: aDialogWindowPresenter [
 
 	super initializeDialogWindow: aDialogWindowPresenter.
 	self updateOkButton.
 
-	aDialogWindowPresenter whenClosedDo: [ accepted ifFalse: [ self cancelAskAction ] ] 
-	
+	aDialogWindowPresenter whenClosedDo: [ 
+		accepted ifFalse: [ self cancelAskAction ] ]
 ]
 
 { #category : 'initialization' }
diff --git a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st
index d38ce6e473..6197b1a9c7 100644
--- a/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st
+++ b/Iceberg-TipUI/IceTipCritiquesBeforeCommitBrowser.class.st
@@ -155,8 +155,8 @@ IceTipCritiquesBeforeCommitBrowser >> initializeDialogWindow: aWindow [
 		action: (MessageSend receiver: self selector: #updatePresenter);
 		yourself).
 
-	aWindow buttons second label: 'Cancel Commit'.
-	aWindow buttons third label: 'Force Commit'.
+	aWindow buttons second label: 'Cancel'.
+	aWindow buttons third label: 'Commit'.
 	
 	aWindow 
 		bindKeyCombination: Character cr asShortcut toAction: [ self accept].
diff --git a/Iceberg-TipUI/IceTipDialogPresenter.class.st b/Iceberg-TipUI/IceTipDialogPresenter.class.st
index 701c18a670..08a0b90e29 100644
--- a/Iceberg-TipUI/IceTipDialogPresenter.class.st
+++ b/Iceberg-TipUI/IceTipDialogPresenter.class.st
@@ -28,8 +28,7 @@ IceTipDialogPresenter >> initializeDialogWindow: aWindow [
 	super initializeDialogWindow: aWindow.
 
 	aWindow 
-		  okAction: [ self accept ];
-		  cancelAction: [ self cancel ]; 
-		  bindKeyCombination: Character escape asShortcut toAction: [ self cancel ].
-		
+		okAction: [ self accept ];
+		cancelAction: [ self cancel ]; 
+		bindKeyCombination: Character escape asShortcut toAction: [ self cancel ]
 ]
diff --git a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st
index 6e52aea96d..7576a4ca0a 100644
--- a/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st
+++ b/Iceberg-TipUI/IceTipErrorDialogPresenter.class.st
@@ -75,11 +75,8 @@ IceTipErrorDialogPresenter >> initialExtentForWindow [
 IceTipErrorDialogPresenter >> initializeDialogWindow: aWindow [
 
 	aWindow 
-		addButton: 'Debug' 
-		do: [ :presenter | self accept. presenter close ].
-	aWindow 
-		addButton: 'Ignore' 
-		do: [ :presenter | presenter close ].
+		addButton: 'Ignore' do: [ :presenter | presenter close ];
+		addDefaultButton: 'Debug' do: [ :presenter | self accept. presenter close ]
 ]
 
 { #category : 'initialization' }
diff --git a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st
index c63a4618b6..0febb5c23c 100644
--- a/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st
+++ b/Iceberg-TipUI/IceTipOptionDialogPresenter.class.st
@@ -68,8 +68,8 @@ IceTipOptionDialogPresenter >> initialExtentForWindow [
 IceTipOptionDialogPresenter >> initializeDialogWindow: aWindowPresenter [
 
 	aWindowPresenter
-		addButton: 'Ok' do: [ :presenter | self accept ];
-		addButton: 'Cancel' do: [ :presenter | presenter close ].	
+		addButton: 'Cancel' do: [ :presenter | presenter close ];
+		addDefaultButton: 'Ok' do: [ :presenter | self accept ].	
 			
 	aWindowPresenter whenOpenedDo: [ self typeList selectIndex: 1 ]
 ]