diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index bda0ffa1..0990b58b 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -100,7 +100,7 @@ void MainWindow::init()
     connect(logWin, SIGNAL(dbState(bool)),this, SLOT(dbState(bool)));
 
     // Load window settings
-    QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
+    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
     restoreGeometry(settings.value("MainWindow/geometry").toByteArray());
     restoreState(settings.value("MainWindow/windowState").toByteArray());
     logWin->comboLogType()->setCurrentIndex(logWin->comboLogType()->findText(settings.value("SQLLogDock/Log", "Application").toString()));
@@ -108,7 +108,6 @@ void MainWindow::init()
     // Set other window settings
     setAcceptDrops(true);
     setWindowTitle(QApplication::applicationName());
-    setWindowIcon(QPixmap(g_applicationIconName));
 }
 
 //***********************************************************
@@ -307,7 +306,7 @@ void MainWindow::fileExit()
 
 void MainWindow::closeEvent( QCloseEvent* event )
 {
-    QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
+    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
     settings.setValue("MainWindow/geometry", saveGeometry());
     settings.setValue("MainWindow/windowState", saveState());
     settings.setValue("SQLLogDock/Log", logWin->comboLogType()->currentText());
@@ -1001,7 +1000,7 @@ void MainWindow::openRecentFile()
 
 void MainWindow::updateRecentFileActions()
 {
-    QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
+    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
     QStringList files = settings.value("recentFileList").toStringList();
 
 
@@ -1025,7 +1024,7 @@ void MainWindow::setCurrentFile(const QString &fileName)
     setWindowTitle( QApplication::applicationName() +" - "+fileName);
     activateFields(true);
 
-    QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
+    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
     QStringList files = settings.value("recentFileList").toStringList();
     files.removeAll(fileName);
     files.prepend(fileName);
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index d026b38b..165395a0 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -13,6 +13,10 @@
   <property name="windowTitle">
    <string>SQLiteBrowser</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="icons/icons.qrc">
+    <normaloff>:/oldimages/icon16</normaloff>:/oldimages/icon16</iconset>
+  </property>
   <widget class="QTabWidget" name="mainTab">
    <property name="currentIndex">
     <number>0</number>
@@ -300,7 +304,7 @@
          <rect>
           <x>0</x>
           <y>0</y>
-          <width>354</width>
+          <width>763</width>
           <height>653</height>
          </rect>
         </property>
diff --git a/src/PreferencesDialog.cpp b/src/PreferencesDialog.cpp
index 47d64dfb..b0d3be36 100644
--- a/src/PreferencesDialog.cpp
+++ b/src/PreferencesDialog.cpp
@@ -69,7 +69,7 @@ void PreferencesDialog::chooseLocation()
 
 void PreferencesDialog::loadSettings()
 {
-    QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
+    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
     settings.sync();
 
     defaultencoding = settings.value( "/db/defaultencoding", "UTF8" ).toString();
@@ -109,7 +109,7 @@ void PreferencesDialog::loadSettings()
 
 void PreferencesDialog::saveSettings()
 {
-    QSettings settings(QApplication::organizationName(), g_sApplicationNameShort);
+    QSettings settings(QApplication::organizationName(), QApplication::organizationName());
 
     settings.setValue( "/db/defaultencoding", defaultencoding  );
     settings.setValue( "/db/defaultnewdata", defaultnewdata );
diff --git a/src/main.cpp b/src/main.cpp
index 5d9ca018..79855ea7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -75,7 +75,7 @@ int main( int argc, char ** argv )
 {
     QApplication a( argc, argv );
     a.setOrganizationName("sqlitebrowser");
-    a.setApplicationName("SQLite Database Browser " + QString(APP_VERSION));
+    a.setApplicationName("SQLite Database Browser");
 
     // Set character encoding to UTF8
     QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
diff --git a/src/sqlitedb.h b/src/sqlitedb.h
index 786768a4..d3b3a683 100644
--- a/src/sqlitedb.h
+++ b/src/sqlitedb.h
@@ -30,9 +30,6 @@ enum
     kSQLiteMediaType_Binary
 };
 
-static QString g_sApplicationNameShort = QString("sqlitebrowser");
-static QString g_applicationIconName = QString(":/oldimages/icon16");
-
 typedef QMap<int, class DBBrowserField> fieldMap;
 typedef QMultiMap<QString, class DBBrowserObject> objectMap;
 typedef QMap<int, int> rowIdMap;