diff --git a/components/LanguageButton.qml b/components/LanguageButton.qml
new file mode 100644
index 00000000..adbd0a39
--- /dev/null
+++ b/components/LanguageButton.qml
@@ -0,0 +1,67 @@
+// Copyright (c) 2020, The Monero Project
+//
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import QtQuick 2.9
+import QtQuick.Layouts 1.3
+
+import FontAwesome 1.0
+
+import "../components" as MoneroComponents
+
+Item {
+    implicitHeight: layout.height
+    implicitWidth: layout.width
+
+    RowLayout {
+        id: layout
+        opacity: mouseArea.containsMouse ? 1 : 0.85
+        spacing: 10
+
+        MoneroComponents.Label {
+            Layout.bottomMargin: 5
+            fontColor: MoneroComponents.Style.defaultFontColor
+            fontFamily: FontAwesome.fontFamilySolid
+            fontSize: 26
+            styleName: "Solid"
+            text: FontAwesome.language
+        }
+
+        MoneroComponents.TextPlain {
+            font.pixelSize: 14
+            text: persistentSettings.language
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        hoverEnabled: true
+        onClicked: appWindow.toggleLanguageView()
+    }
+}
diff --git a/qml.qrc b/qml.qrc
index 31754983..bc4c005e 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -4,6 +4,7 @@
         <file>LeftPanel.qml</file>
         <file>MiddlePanel.qml</file>
         <file>components/Label.qml</file>
+        <file>components/LanguageButton.qml</file>
         <file>components/SettingsListItem.qml</file>
         <file>components/Slider.qml</file>
         <file>components/UpdateDialog.qml</file>
diff --git a/wizard/WizardHome.qml b/wizard/WizardHome.qml
index 81d27bec..84b62f3e 100644
--- a/wizard/WizardHome.qml
+++ b/wizard/WizardHome.qml
@@ -30,7 +30,6 @@ import QtQuick 2.9
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0
-import FontAwesome 1.0
 import moneroComponents.NetworkType 1.0
 
 import "../components" as MoneroComponents
@@ -68,32 +67,8 @@ Rectangle {
                     subtitle: ""
                 }
 
-                RowLayout {
+                MoneroComponents.LanguageButton {
                     Layout.bottomMargin: 8
-                    opacity: mouseArea.containsMouse ? 1 : 0.85
-                    spacing: 10
-
-                    MoneroComponents.Label {
-                        Layout.bottomMargin: 5
-                        fontColor: MoneroComponents.Style.defaultFontColor
-                        fontFamily: FontAwesome.fontFamilySolid
-                        fontSize: 26
-                        styleName: "Solid"
-                        text: FontAwesome.language
-                    }
-
-                    MoneroComponents.TextPlain {
-                        font.pixelSize: 14
-                        text: wizard.language_language
-                    }
-
-                    MouseArea {
-                        id: mouseArea
-                        anchors.fill: parent
-                        cursorShape: Qt.PointingHandCursor
-                        hoverEnabled: true
-                        onClicked: appWindow.toggleLanguageView()
-                    }
                 }
             }
 
diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml
index 4aa04ba0..3f7ce3b9 100644
--- a/wizard/WizardLanguage.qml
+++ b/wizard/WizardLanguage.qml
@@ -152,15 +152,7 @@ Rectangle {
             Layout.fillWidth: true
             columnSpacing: 20
 
-            MoneroComponents.StandardButton {
-                id: idChangeLang
-                Layout.minimumWidth: 150
-                text: qsTr("Language") + translationManager.emptyString
-
-                onClicked: {
-                    appWindow.toggleLanguageView();
-                }
-            }
+            MoneroComponents.LanguageButton { }
 
             MoneroComponents.StandardButton {
                 id: btnContinue