diff --git a/changelog b/changelog
index 7ea46a6..d8bb1c4 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,7 @@
 ----------------------------
     0.4.1 (2009-08-XX)
 ----------------------------
-- Added initial documentation
+- Added initial documentation (by Jussi Sainio)
 - Added and improved many translations
 - Seperate columns settings between normal and search results view
 - Interrupt auto-type if the focused window changed meanwhile
diff --git a/share/keepassx/icons/keepassx_large.png b/share/keepassx/icons/keepassx_large.png
index 33234c8..24c2c4b 100644
Binary files a/share/keepassx/icons/keepassx_large.png and b/share/keepassx/icons/keepassx_large.png differ
diff --git a/src/dialogs/AboutDlg.cpp b/src/dialogs/AboutDlg.cpp
index 87f8541..5186f3d 100644
--- a/src/dialogs/AboutDlg.cpp
+++ b/src/dialogs/AboutDlg.cpp
@@ -24,7 +24,7 @@
 AboutDialog::AboutDialog(QWidget* parent):QDialog(parent)
 {
 	setupUi(this);
-	createBanner(&BannerPixmap,getPixmap("keepassx_large"),QString("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION),width());
+	createBanner(&BannerPixmap,getPixmap("keepassx"),QString("%1 %2").arg(APP_DISPLAY_NAME, APP_VERSION),width());
 
     labelAppName->setText(APP_DISPLAY_NAME);
     labelAppFunc->setText(QString(" -  ").append(APP_LONG_FUNC));
diff --git a/src/dialogs/AutoTypeDlg.cpp b/src/dialogs/AutoTypeDlg.cpp
index 5a377a8..f65eb47 100644
--- a/src/dialogs/AutoTypeDlg.cpp
+++ b/src/dialogs/AutoTypeDlg.cpp
@@ -89,7 +89,7 @@ void AutoTypeDlg::paintEvent(QPaintEvent* event){
 }
 
 void AutoTypeDlg::resizeEvent(QResizeEvent* event){
-	createBanner(&BannerPixmap,getPixmap("keepassx_large"),tr("Auto-Type"),width());
+	createBanner(&BannerPixmap,getPixmap("keepassx"),tr("Auto-Type"),width());
 	QWidget::resizeEvent(event);
 }
 
diff --git a/src/dialogs/EditEntryDlg.cpp b/src/dialogs/EditEntryDlg.cpp
index 3f7d061..803a5e5 100644
--- a/src/dialogs/EditEntryDlg.cpp
+++ b/src/dialogs/EditEntryDlg.cpp
@@ -144,7 +144,7 @@ CEditEntryDlg::~CEditEntryDlg(){
 }
 
 void CEditEntryDlg::resizeEvent(QResizeEvent *event){
-	createBanner(&BannerPixmap,getPixmap("keepassx_large"),pNewEntry?tr("New Entry"):tr("Edit Entry"),width());
+	createBanner(&BannerPixmap,getPixmap("keepassx"),pNewEntry?tr("New Entry"):tr("Edit Entry"),width());
 	QDialog::resizeEvent(event);
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index e7aa05d..b4c78f7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -184,7 +184,12 @@ int main(int argc, char **argv)
 	DetailViewTemplate=config->detailViewTemplate();
 
 	loadImages();
+#ifdef Q_WS_MAC
+	// use large icon for Mac OS dock
+	QApplication::setWindowIcon(getIcon("keepassx_large"));
+#else
 	QApplication::setWindowIcon(getIcon("keepassx_small"));
+#endif
 	KpxBookmarks::load();
 	initYarrow(); //init random number generator
 	SecString::generateSessionKey();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ba4cf5d..8f1a81c 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -273,7 +273,7 @@ void KeepassMainWindow::setupIcons(){
 	AddThisAsBookmarkAction->setIcon(getIcon("bookmark_this"));
 	AddBookmarkAction->setIcon(getIcon("bookmark_add"));
 	ManageBookmarksAction->setIcon(getIcon("bookmark"));
-	SysTray->setIcon(getIcon("keepassx_large"));
+	SysTray->setIcon(getIcon("keepassx"));
 	if(config->showSysTrayIcon())
 		SysTray->show();
 }
@@ -1344,7 +1344,7 @@ void KeepassMainWindow::resetLock(){
 	LockedCentralWidget->setParent(NULL);
 	setCentralWidget(NormalCentralWidget);
 	NormalCentralWidget->setVisible(true);
-	SysTray->setIcon(getIcon("keepassx_large"));
+	SysTray->setIcon(getIcon("keepassx"));
 	FileUnLockWorkspaceAction->setText(tr("&Lock Workspace"));
 	IsLocked=false;
 	updateTrayTooltip();