diff --git a/src/dialogs/AutoTypeDlg.cpp b/src/dialogs/AutoTypeDlg.cpp
index f65eb47..72904a1 100644
--- a/src/dialogs/AutoTypeDlg.cpp
+++ b/src/dialogs/AutoTypeDlg.cpp
@@ -29,6 +29,7 @@ AutoTypeDlg::AutoTypeDlg(QList<IEntryHandle*> entries, QList<int> numbers, bool
 	setAttribute(Qt::WA_DeleteOnClose);
 	setWindowFlags(windowFlags()|Qt::WindowStaysOnTopHint);
 	setGeometry( QRect(QApplication::desktop()->screenGeometry(QCursor::pos()).center() - rect().center(), size()) );
+	setWindowIcon(getIcon("keepassx_small"));
 	entryList->setAlternatingRowColors(config->alternatingRowColors());
 	
 	bool hideUsernames = config->hideUsernames();
diff --git a/src/main.cpp b/src/main.cpp
index b4c78f7..c825647 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -184,12 +184,6 @@ 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 8f1a81c..86bc747 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -235,6 +235,7 @@ void KeepassMainWindow::setupToolbar(){
 }
 
 void KeepassMainWindow::setupIcons(){
+	setWindowIcon(getIcon("keepassx_small"));
 	FileNewAction->setIcon(getIcon("filenew"));
 	FileOpenAction->setIcon(getIcon("fileopen"));
 	FileSaveAction->setIcon(getIcon("filesave"));