diff --git a/ShadedDisplay.cpp b/ShadedDisplay.cpp
index 56cacf0..dec18cc 100644
--- a/ShadedDisplay.cpp
+++ b/ShadedDisplay.cpp
@@ -18,7 +18,7 @@ ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
 	m_number2->move (147, 4);
 	m_number2->setNumber (0, 2);
 
-	m_title = new TextScroller (this, 48, 7, "shaded");
+	m_title = new TextScroller (this, 39, 7, "shaded");
 	m_title->move (79, 4);
 	m_title->setText ("Promoe 0.1");
 
diff --git a/Skin.cpp b/Skin.cpp
index 7ad06aa..b25a8ee 100644
--- a/Skin.cpp
+++ b/Skin.cpp
@@ -119,7 +119,8 @@ Skin::getPixmap (QString f, QDir dir)
 	QFileInfoList list = dir.entryInfoList();
 	for (int i = 0; i < list.size(); ++i) {
 		QFileInfo fileInfo = list.at(i);
-		if (fileInfo.fileName().toLower() == f) {
+		QString fname = fileInfo.fileName().toLower();
+		if (fname.section(".", 0, 0) == f) {
 			return QPixmap (fileInfo.filePath());
 		}
 	}
diff --git a/SkinChooser.cpp b/SkinChooser.cpp
index 51fa078..30ea0f0 100644
--- a/SkinChooser.cpp
+++ b/SkinChooser.cpp
@@ -48,7 +48,7 @@ SkinList::SkinList (QWidget *parent) : QListWidget (parent)
 	path.append ("/.xmms2/clients/promoe/skins/");
 	QDir d;
 			
-	new SkinChooserItem (QIcon (":CleanAMP/main.bmp"), "CleanAMP (default)", ":CleanAMP/", this);
+	new SkinChooserItem (QIcon (":CleanAMP/main.png"), "CleanAMP (default)", ":CleanAMP/", this);
 
 	d.setPath (path);
 	d.setFilter (QDir::Dirs);
@@ -57,7 +57,7 @@ SkinList::SkinList (QWidget *parent) : QListWidget (parent)
 	for (int i = 0; i < list.size(); ++i) {
 		QFileInfo fileInfo = list.at(i);
 		QDir dir (fileInfo.filePath());
-		QPixmap p = Skin::getPixmap ("main.bmp", dir);
+		QPixmap p = Skin::getPixmap ("main", dir);
 		if (!p.isNull()) {
 			new SkinChooserItem (QIcon (p), dir.dirName(), dir.absolutePath(), this);
 		}