diff --git a/src/drivers/Qt/GamePadConf.cpp b/src/drivers/Qt/GamePadConf.cpp
index 1365ea32..835aeb2c 100644
--- a/src/drivers/Qt/GamePadConf.cpp
+++ b/src/drivers/Qt/GamePadConf.cpp
@@ -81,9 +81,12 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent)
    QPushButton *closebutton;
    QPushButton *clearButton[GAMEPAD_NUM_BUTTONS];
 	QScrollArea *scroll;
+	QStyle      *style;
 	std::string prefix;
 	char stmp[256];
 
+	style = this->style();
+
 	gamePadConfWin = this;
 
 	// Ensure that joysticks are enabled, no harm calling init again.
@@ -174,10 +177,12 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent)
 
    applyProfileButton = new QPushButton( tr("Load") );
 	applyProfileButton->setWhatsThis(tr("Sets Current Active Map to the Selected Profile"));
+	applyProfileButton->setIcon( style->standardIcon( QStyle::SP_DialogApplyButton ) );
    hbox->addWidget( applyProfileButton );
 
    saveProfileButton = new QPushButton( tr("Save") );
 	saveProfileButton->setWhatsThis(tr("Stores Current Active Map to the Selected Profile"));
+	saveProfileButton->setIcon( style->standardIcon( QStyle::SP_DialogSaveButton ) );
    hbox->addWidget( saveProfileButton );
 
 	hbox = new QHBoxLayout();
@@ -185,10 +190,12 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent)
 
    newProfileButton   = new QPushButton( tr("New") );
 	newProfileButton->setWhatsThis(tr("Create a New Map Profile"));
+	newProfileButton->setIcon( style->standardIcon( QStyle::SP_FileIcon ) );
    hbox->addWidget( newProfileButton );
 
    removeProfileButton   = new QPushButton( tr("Delete") );
 	removeProfileButton->setWhatsThis(tr("Deletes the Selected Map Profile"));
+	removeProfileButton->setIcon( style->standardIcon( QStyle::SP_TrashIcon ) );
    hbox->addWidget( removeProfileButton );
 
    mapMsg = new QLabel();
@@ -242,6 +249,9 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent)
    clearAllButton     = new QPushButton(tr("Clear All"));
    closebutton        = new QPushButton(tr("Close"));
 
+	clearAllButton->setIcon( style->standardIcon( QStyle::SP_LineEditClearButton ) );
+	closebutton->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) );
+
 	hbox4->addWidget( clearAllButton    );
 	hbox4->addWidget( closebutton       );
 
diff --git a/src/drivers/Qt/PaletteConf.cpp b/src/drivers/Qt/PaletteConf.cpp
index c8a6845c..7908aaab 100644
--- a/src/drivers/Qt/PaletteConf.cpp
+++ b/src/drivers/Qt/PaletteConf.cpp
@@ -32,10 +32,13 @@ PaletteConfDialog_t::PaletteConfDialog_t(QWidget *parent)
    //QPushButton *closebutton;
 	QPushButton *button;
 	QTextEdit *comments;
+	QStyle    *style;
 	int hue, tint;
 	char stmp[64];
 	std::string paletteFile;
 
+	style = this->style();
+
 	resize( 512, 600 );
 
 	// sync with config
@@ -63,6 +66,7 @@ PaletteConfDialog_t::PaletteConfDialog_t(QWidget *parent)
 	connect(deemphSwap, SIGNAL(stateChanged(int)), this, SLOT(deemphswap_Changed(int)) );
 
 	button = new QPushButton( tr("Open Palette") );
+	button->setIcon( style->standardIcon( QStyle::SP_FileDialogStart ) );
 	hbox1->addWidget( button );
 
 	connect( button, SIGNAL(clicked(void)), this, SLOT(openPaletteFile(void)) );
@@ -81,6 +85,7 @@ PaletteConfDialog_t::PaletteConfDialog_t(QWidget *parent)
 
 
 	button = new QPushButton( tr("Clear") );
+	button->setIcon( style->standardIcon( QStyle::SP_LineEditClearButton ) );
 	hbox1->addWidget( button );
 
 	connect( button, SIGNAL(clicked(void)), this, SLOT(clearPalette(void)) );