diff --git a/PKGBUILD b/PKGBUILD
index d7cf3f3..2aeeffd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ optdepends=('kdebase-runtime: sudo support'
             'wpa_supplicant: wifi support')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
 install="${pkgbase}.install"
-md5sums=('5b3105a64bc162d30a41a2b3bcb06f0a')
+md5sums=('bb1cc09e7ea781563219cbfd42e97931')
 
 prepare() {
   rm -rf "${srcdir}/"{build-plasmoid,build-qt4,build-qt5}
diff --git a/screenshots/dataengine.png b/screenshots/dataengine.png
deleted file mode 100644
index 179b95b..0000000
Binary files a/screenshots/dataengine.png and /dev/null differ
diff --git a/screenshots/de-main.png b/screenshots/de-main.png
new file mode 100644
index 0000000..2a6059e
Binary files /dev/null and b/screenshots/de-main.png differ
diff --git a/screenshots/gui-about.png b/screenshots/gui-about.png
new file mode 100644
index 0000000..eb21b7a
Binary files /dev/null and b/screenshots/gui-about.png differ
diff --git a/screenshots/gui-main_tab.png b/screenshots/gui-main_tab.png
new file mode 100644
index 0000000..fa5548b
Binary files /dev/null and b/screenshots/gui-main_tab.png differ
diff --git a/screenshots/gui-netctl-auto.png b/screenshots/gui-netctl-auto.png
new file mode 100644
index 0000000..2a3fa0a
Binary files /dev/null and b/screenshots/gui-netctl-auto.png differ
diff --git a/screenshots/gui-profile_tab.png b/screenshots/gui-profile_tab.png
new file mode 100644
index 0000000..bed7bf9
Binary files /dev/null and b/screenshots/gui-profile_tab.png differ
diff --git a/screenshots/gui-settings.png b/screenshots/gui-settings.png
new file mode 100644
index 0000000..a1a76a3
Binary files /dev/null and b/screenshots/gui-settings.png differ
diff --git a/screenshots/gui-wifi_tab.png b/screenshots/gui-wifi_tab.png
new file mode 100644
index 0000000..c970174
Binary files /dev/null and b/screenshots/gui-wifi_tab.png differ
diff --git a/screenshots/gui_main.png b/screenshots/gui_main.png
deleted file mode 100644
index 78ed80e..0000000
Binary files a/screenshots/gui_main.png and /dev/null differ
diff --git a/screenshots/gui_profile.png b/screenshots/gui_profile.png
deleted file mode 100644
index 1f6da70..0000000
Binary files a/screenshots/gui_profile.png and /dev/null differ
diff --git a/screenshots/gui_wifi.png b/screenshots/gui_wifi.png
deleted file mode 100644
index 81e3662..0000000
Binary files a/screenshots/gui_wifi.png and /dev/null differ
diff --git a/screenshots/plasmoid-config_1.png b/screenshots/plasmoid-config_1.png
new file mode 100644
index 0000000..3290385
Binary files /dev/null and b/screenshots/plasmoid-config_1.png differ
diff --git a/screenshots/plasmoid-config_2.png b/screenshots/plasmoid-config_2.png
new file mode 100644
index 0000000..1ec1b07
Binary files /dev/null and b/screenshots/plasmoid-config_2.png differ
diff --git a/screenshots/plasmoid-config_3.png b/screenshots/plasmoid-config_3.png
new file mode 100644
index 0000000..ec5ad1a
Binary files /dev/null and b/screenshots/plasmoid-config_3.png differ
diff --git a/screenshots/plasmoid-main.png b/screenshots/plasmoid-main.png
new file mode 100644
index 0000000..46a7982
Binary files /dev/null and b/screenshots/plasmoid-main.png differ
diff --git a/screenshots/plasmoid.png b/screenshots/plasmoid.png
deleted file mode 100644
index 462cbe4..0000000
Binary files a/screenshots/plasmoid.png and /dev/null differ
diff --git a/screenshots/plasmoid_conf_01.png b/screenshots/plasmoid_conf_01.png
deleted file mode 100644
index 75d610a..0000000
Binary files a/screenshots/plasmoid_conf_01.png and /dev/null differ
diff --git a/screenshots/plasmoid_conf_02.png b/screenshots/plasmoid_conf_02.png
deleted file mode 100644
index 8b9d457..0000000
Binary files a/screenshots/plasmoid_conf_02.png and /dev/null differ
diff --git a/sources/gui/src/mainwindow.cpp b/sources/gui/src/mainwindow.cpp
index 88afca1..e6108de 100644
--- a/sources/gui/src/mainwindow.cpp
+++ b/sources/gui/src/mainwindow.cpp
@@ -232,7 +232,6 @@ void MainWindow::createActions()
     if (debug) qDebug() << "[MainWindow]" << "[createActions]";
 
     connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTabs(int)));
-    connect(ui->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateMenu(int)));
     connect(ui->actionAbout, SIGNAL(triggered(bool)), aboutWin, SLOT(show()));
     connect(ui->actionNetctlAuto, SIGNAL(triggered(bool)), netctlAutoWin, SLOT(showWindow()));
     ui->actionNetctlAuto->setVisible(checkExternalApps(QString("all")));
@@ -240,7 +239,7 @@ void MainWindow::createActions()
     connect(ui->actionQuit, SIGNAL(triggered(bool)), this, SLOT(close()));
 
     // actions menu
-    //connect(ui->menuActions, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
+    connect(ui->menuActions, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
     connect(ui->actionMainEdit, SIGNAL(triggered(bool)), this, SLOT(mainTabEditProfile()));
     connect(ui->actionMainEnable, SIGNAL(triggered(bool)), this, SLOT(mainTabEnableProfile()));
     connect(ui->actionMainRefresh, SIGNAL(triggered(bool)), this, SLOT(updateMainTab()));
@@ -362,15 +361,15 @@ void MainWindow::updateTabs(const int tab)
         updateProfileTab();
     else if (tab == 2)
         updateWifiTab();
-    updateMenu(tab);
+    updateMenu();
 }
 
 
-void MainWindow::updateMenu(const int tab)
+void MainWindow::updateMenu()
 {
     if (debug) qDebug() << "[MainWindow]" << "[updateMenu]";
-    if (debug) qDebug() << "[MainWindow]" << "[updateMenu]" << ":" << "Update tab" << tab;
 
+    int tab = ui->tabWidget->currentIndex();
     setMenuActionsShown(false);
 
     if (tab == 0)
diff --git a/sources/gui/src/mainwindow.h b/sources/gui/src/mainwindow.h
index 5af9679..0199fcf 100644
--- a/sources/gui/src/mainwindow.h
+++ b/sources/gui/src/mainwindow.h
@@ -68,7 +68,7 @@ public:
 
 public slots:
     void updateTabs(const int tab);
-    void updateMenu(const int tab);
+    void updateMenu();
     // wifi tab slots
     void connectToUnknownEssid(const QString passwd);
     void setHiddenName(const QString name);
diff --git a/sources/plasmoid/netctl.cpp b/sources/plasmoid/netctl.cpp
index 2ecd7f7..7309535 100644
--- a/sources/plasmoid/netctl.cpp
+++ b/sources/plasmoid/netctl.cpp
@@ -493,7 +493,7 @@ void Netctl::disconnectFromEngine()
 //  configuration interface
 void Netctl::selectActiveIcon()
 {
-    KUrl url = KFileDialog::getOpenUrl(KUrl("/usr/bin"), "*");
+    KUrl url = KFileDialog::getOpenUrl(KUrl("/usr/share/icons"), "*");
     if (!url.isEmpty())
         uiAppConfig.lineEdit_activeIcon->setText(url.path());
 }
@@ -509,7 +509,7 @@ void Netctl::selectGuiExe()
 
 void Netctl::selectInactiveIcon()
 {
-    KUrl url = KFileDialog::getOpenUrl(KUrl("/usr/bin"), "*");
+    KUrl url = KFileDialog::getOpenUrl(KUrl("/usr/share/icons"), "*");
     if (!url.isEmpty())
         uiAppConfig.lineEdit_inactiveIcon->setText(url.path());
 }
@@ -557,7 +557,7 @@ void Netctl::selectDataEngineExternalIpExe()
 
 void Netctl::selectDataEngineInterfacesDirectory()
 {
-    KUrl url = KFileDialog::getExistingDirectoryUrl(KUrl("/"));
+    KUrl url = KFileDialog::getExistingDirectoryUrl(KUrl("/sys"));
     if (!url.isEmpty())
         uiDEConfig.lineEdit_interface->setText(url.path());
 }