diff --git a/src/ui/fortmanager.cpp b/src/ui/fortmanager.cpp
index 6718f5ea..ea03b9ee 100644
--- a/src/ui/fortmanager.cpp
+++ b/src/ui/fortmanager.cpp
@@ -105,8 +105,9 @@ void FortManager::showTrayIcon()
 
 void FortManager::showWindow()
 {
-    if (!m_engine)
+    if (!m_engine) {
         setupEngine();
+    }
 
     if (m_firewallConfToEdit == nullConf()) {
         setFirewallConfToEdit(cloneConf(*m_firewallConf));
diff --git a/src/ui/qml/main.qml b/src/ui/qml/main.qml
index 0260d75b..c53f75c6 100644
--- a/src/ui/qml/main.qml
+++ b/src/ui/qml/main.qml
@@ -51,6 +51,7 @@ ApplicationWindow {
     MainPage {
         id: mainPage
         anchors.fill: parent
+        implicitWidth: 0  // XXX: Workaround for binding loop
 
         Keys.onEscapePressed: closeWindow()
     }
diff --git a/src/ui/qml/pages/ApplicationsPage.qml b/src/ui/qml/pages/ApplicationsPage.qml
index 55d0c8e4..6061f945 100644
--- a/src/ui/qml/pages/ApplicationsPage.qml
+++ b/src/ui/qml/pages/ApplicationsPage.qml
@@ -97,8 +97,8 @@ BasePage {
                 TabButton {
                     width: Math.max(100, implicitWidth)
                     font.bold: checked
-                    text: appGroup.name
                     icon.source: "qrc:/images/application_double.png"
+                    text: appGroup.name
 
                     readonly property AppGroup appGroup: modelData
                 }
diff --git a/src/ui/qml/pages/MainPage.qml b/src/ui/qml/pages/MainPage.qml
index f89df2c8..2b389b05 100644
--- a/src/ui/qml/pages/MainPage.qml
+++ b/src/ui/qml/pages/MainPage.qml
@@ -19,20 +19,20 @@ Page {
         currentIndex: swipeView.currentIndex
 
         TabButton {
-            text: QT_TRANSLATE_NOOP("qml", "Options")
             icon.source: "qrc:/images/cog.png"
+            text: QT_TRANSLATE_NOOP("qml", "Options")
         }
         TabButton {
-            text: QT_TRANSLATE_NOOP("qml", "IPv4 Addresses")
             icon.source: "qrc:/images/link.png"
+            text: QT_TRANSLATE_NOOP("qml", "IPv4 Addresses")
         }
         TabButton {
-            text: QT_TRANSLATE_NOOP("qml", "Applications")
             icon.source: "qrc:/images/application_cascade.png"
+            text: QT_TRANSLATE_NOOP("qml", "Applications")
         }
         TabButton {
-            text: QT_TRANSLATE_NOOP("qml", "Activity")
             icon.source: "qrc:/images/zoom.png"
+            text: QT_TRANSLATE_NOOP("qml", "Activity")
         }
     }