Merge commit 'b88ab8e432' into improve_navigation_cpp

client/translations/amneziavpn_ru_RU.ts

@@ -2679,7 +2679,7 @@ and will not be shared or disclosed to the Amnezia or any third parties</source>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="154"/>
         <source>Where to get connection data, step-by-step instructions for buying a VPS</source>
-        <translation>Где взять данные для подключения, пошаговые инстуркции по покупке VPS</translation>
+        <translation>Где взять данные для подключения, пошаговые инструкции по покупке VPS</translation>
     </message>
     <message>
         <location filename="../ui/qml/Pages2/PageSetupWizardCredentials.qml" line="170"/>

client/ui/qml/Controls2/BasicButtonType.qml

@@ -24,7 +24,7 @@ Button {
 
     property string leftImageSource
     property string rightImageSource
-    property string leftImageColor
+    property string leftImageColor: textColor
     property bool changeLeftImageSize: true
 
     property bool squareLeftSide: false

client/ui/qml/Pages2/PageHome.qml

@@ -109,6 +109,7 @@ PageType {
                 text: isSplitTunnelingEnabled ? qsTr("Split tunneling enabled") : qsTr("Split tunneling disabled")
 
                 leftImageSource: isSplitTunnelingEnabled ? "qrc:/images/controls/split-tunneling.svg" : ""
+                leftImageColor: ""
                 rightImageSource: "qrc:/images/controls/chevron-down.svg"
 
                 Keys.onEnterPressed: splitTunnelingButton.clicked()