diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt
index 1039c7d8..64dd5353 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/UnitConverterActivity.kt
@@ -1,9 +1,11 @@
 package com.simplemobiletools.calculator.activities
 
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
 import androidx.core.content.res.ResourcesCompat
+import com.simplemobiletools.calculator.R
 import com.simplemobiletools.calculator.databinding.ActivityUnitConverterBinding
 import com.simplemobiletools.calculator.extensions.config
 import com.simplemobiletools.calculator.extensions.updateViewColors
@@ -30,6 +32,12 @@ class UnitConverterActivity : SimpleActivity() {
         isMaterialActivity = true
         super.onCreate(savedInstanceState)
         setContentView(binding.root)
+
+        if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+            binding.unitConverterToolbar.inflateMenu(R.menu.converter_menu)
+            setupOptionsMenu()
+        }
+
         updateMaterialActivityViews(binding.unitConverterCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false)
         setupMaterialScrollListener(binding.nestedScrollview, binding.unitConverterToolbar)
 
@@ -59,6 +67,16 @@ class UnitConverterActivity : SimpleActivity() {
         binding.unitConverterToolbar.setTitle(converter.nameResId)
     }
 
+    private fun setupOptionsMenu() {
+        binding.unitConverterToolbar.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.swap_units -> binding.viewUnitConverter.viewConverter.root.switch()
+                else -> return@setOnMenuItemClickListener false
+            }
+            return@setOnMenuItemClickListener true
+        }
+    }
+
     override fun onResume() {
         super.onResume()
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt
index cc35cf3c..16c44193 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/views/ConverterView.kt
@@ -48,7 +48,7 @@ class ConverterView @JvmOverloads constructor(
         AutofitHelper.create(binding.topUnitText)
         AutofitHelper.create(binding.bottomUnitText)
 
-        binding.swapButton.setOnClickListener { switch() }
+        binding.swapButton?.setOnClickListener { switch() }
 
         binding.topUnitHolder.setClickListenerForUnitSelector(::topUnit, ::bottomUnit)
         binding.bottomUnitHolder.setClickListenerForUnitSelector(::bottomUnit, ::topUnit)
@@ -86,7 +86,7 @@ class ConverterView @JvmOverloads constructor(
         }
 
         binding.topUnitHolder.backgroundTintList = ColorStateList.valueOf(context.getProperPrimaryColor().lightenColor().adjustAlpha(LOWER_ALPHA))
-        binding.swapButton.applyColorFilter(context.getProperPrimaryColor())
+        binding.swapButton?.applyColorFilter(context.getProperPrimaryColor())
 
         listOf(binding.topUnitSymbol, binding.bottomUnitSymbol).forEach {
             val drawable = ResourcesCompat.getDrawable(
@@ -167,7 +167,7 @@ class ConverterView @JvmOverloads constructor(
         binding.topUnitText.text = value
     }
 
-    private fun switch() {
+    fun switch() {
         ::topUnit.swapWith(::bottomUnit)
         updateBottomValue()
         updateUnitLabelsAndSymbols()
diff --git a/app/src/main/res/layout-land/view_converter.xml b/app/src/main/res/layout-land/view_converter.xml
new file mode 100644
index 00000000..25f3062b
--- /dev/null
+++ b/app/src/main/res/layout-land/view_converter.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.simplemobiletools.calculator.views.ConverterView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/top_unit_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="3"
+        android:background="@drawable/colored_ripple"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin">
+
+        <TextView
+            android:id="@+id/top_unit_name"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginStart="@dimen/activity_margin"
+            android:gravity="center"
+            android:textAlignment="gravity"
+            android:textSize="@dimen/big_text_size"
+            app:drawableEndCompat="@drawable/ic_arrow_drop_down_vector"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/top_unit_text"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="@dimen/normal_margin"
+            android:layout_weight="2"
+            android:gravity="end|center_vertical"
+            android:singleLine="true"
+            android:textAlignment="gravity"
+            android:textSize="@dimen/extra_big_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/top_unit_symbol"
+            app:layout_constraintStart_toEndOf="@+id/top_unit_name"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/top_unit_symbol"
+            style="@style/MyButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minHeight="@dimen/unit_symbol_size"
+            android:padding="@dimen/small_margin"
+            android:singleLine="true"
+            android:textAlignment="gravity"
+            android:textSize="@dimen/big_text_size"
+            app:layout_constraintBottom_toBottomOf="@+id/top_unit_text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/top_unit_text" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/bottom_unit_holder"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="3"
+        android:background="@drawable/ripple_background"
+        android:orientation="vertical"
+        android:paddingStart="@dimen/activity_margin"
+        android:paddingEnd="@dimen/activity_margin">
+
+        <TextView
+            android:id="@+id/bottom_unit_name"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_gravity="start|center_vertical"
+            android:layout_marginStart="@dimen/activity_margin"
+            android:gravity="center"
+            android:textAlignment="gravity"
+            android:textSize="@dimen/big_text_size"
+            app:drawableEndCompat="@drawable/ic_arrow_drop_down_vector"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/bottom_unit_text"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginEnd="@dimen/normal_margin"
+            android:gravity="end|center_vertical"
+            android:singleLine="true"
+            android:textAlignment="gravity"
+            android:textSize="@dimen/extra_big_text_size"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/bottom_unit_symbol"
+            app:layout_constraintStart_toEndOf="@+id/bottom_unit_name"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/bottom_unit_symbol"
+            style="@style/MyButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:minHeight="@dimen/unit_symbol_size"
+            android:padding="@dimen/small_margin"
+            android:singleLine="true"
+            android:textAlignment="gravity"
+            android:textSize="@dimen/big_text_size"
+            app:layout_constraintBottom_toBottomOf="@+id/bottom_unit_text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/bottom_unit_text" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.simplemobiletools.calculator.views.ConverterView>
diff --git a/app/src/main/res/layout/view_converter.xml b/app/src/main/res/layout/view_converter.xml
index 09aaa5c5..78ca140e 100644
--- a/app/src/main/res/layout/view_converter.xml
+++ b/app/src/main/res/layout/view_converter.xml
@@ -66,7 +66,6 @@
         android:background="@drawable/ripple_circle_background"
         android:layout_gravity="center"
         android:padding="@dimen/activity_margin"
-        android:layout_weight="0.5"
         android:src="@drawable/ic_swap_vertical_vector" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/view_unit_converter.xml b/app/src/main/res/layout/view_unit_converter.xml
index 05d84856..f57f887f 100644
--- a/app/src/main/res/layout/view_unit_converter.xml
+++ b/app/src/main/res/layout/view_unit_converter.xml
@@ -7,6 +7,7 @@
     android:hapticFeedbackEnabled="true"
     android:layoutDirection="ltr"
     android:orientation="vertical"
+    android:weightSum="11.5"
     tools:ignore="HardcodedText">
 
     <include
diff --git a/app/src/main/res/menu/converter_menu.xml b/app/src/main/res/menu/converter_menu.xml
new file mode 100644
index 00000000..c27c4182
--- /dev/null
+++ b/app/src/main/res/menu/converter_menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
+    <item
+        android:id="@+id/swap_units"
+        android:icon="@drawable/ic_swap_vertical_vector"
+        android:title="@string/swap_units"
+        app:showAsAction="always" />
+</menu>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 2b4d8687..3cf08a53 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">الحاسبة</string>
     <string name="scientific_calculator">الحاسبة العلمية</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">خطأ: القسمة على صفر</string>
     <!-- History -->
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 6b4574c5..0335b004 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Kalkulyator</string>
     <string name="scientific_calculator">Scientific Calculator</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
 
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Səhv: sıfıra bölünmə</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 2966ce56..3b11bde7 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Калькулятар</string>
     <string name="scientific_calculator">Навуковы калькулятар</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Памылка: дзяленне на нуль</string>
     <!-- History -->
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index fa43f646..3640027f 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Калкулатор</string>
     <string name="scientific_calculator">Научен калкулатор</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Грешка: деление на нула</string>
     <!-- History -->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 1e2f81b5..78ce9cbd 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Naučni kalkulator</string>
     <string name="unit_converter">Pretvarač jedinica</string>
+    <string name="swap_units">Zamijeni jedinice</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Greška: dijeljenje s nulom</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index d3821fb5..bdc9b4e3 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculadora</string>
     <string name="scientific_calculator">Calculadora científica</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Error: divisió per zero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b7a48d06..a8652e27 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulačka</string>
     <string name="scientific_calculator">Vědecká kalkulačka</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Chyba: dělení nulou</string>
     <!-- History -->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 2afceee7..77283d2d 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Cyfrifiannell</string>
     <string name="scientific_calculator">Cyfrifiannell Gwyddonol</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Gwall: rhannu â sero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 2deb275d..8d4ded58 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Lommeregner</string>
     <string name="scientific_calculator">Videnskabelig lommeregner</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Fejl: division med nul</string>
     <!-- History -->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 79af9040..7a83cae5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Rechner</string>ng&gt;
     <string name="scientific_calculator">Wissenschaftlicher Rechner</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Fehler: Division durch Null</string>
     <!-- History -->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index b52b4061..1fdc0105 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Αριθμομηχανή</string>
     <string name="scientific_calculator">Επιστημονική Αριθμομηχανή</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
 
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Σφάλμα: διαίρεση με μηδέν</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 0112a7c0..620ceba5 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulilo</string>
     <string name="scientific_calculator">Sciena kalkulilo</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Eraro: divido per nul</string>
     <!-- History -->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d2723466..be6da0b6 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculadora</string>
     <string name="scientific_calculator">Calculadora científica</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Error: división por cero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 8646e31d..42a15cae 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulaator</string>
     <string name="scientific_calculator">Teadusrežiim</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Viga: nulliga jagamine</string>
     <!-- History -->
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b868b6da..9e3dcfa3 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Laskin</string>
     <string name="scientific_calculator">Funktiolaskin</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Virhe: jako nollalla</string>
     <!-- History -->
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index 5a7702f4..d6c610ae 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculator</string>
     <string name="scientific_calculator">Scientific Calculator</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <string name="formula_divide_by_zero_error">Error: paghahati sa zero</string>
     <string name="history">Nakaraan</string>
     <string name="history_empty">Walang nakaraan</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 4e256331..f33de281 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculatrice</string>
     <string name="scientific_calculator">Calculatrice scientifique</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Erreur : division par zéro</string>
     <!-- History -->
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 8e6a8def..a2356a9a 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculadora</string>
     <string name="scientific_calculator">Calculadora Científica</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Erro: división por cero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index a3b78e71..12671ec1 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">कैलकुलेटर</string>
     <string name="scientific_calculator">वैज्ञानिक कैलकुलेटर</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <string name="formula_divide_by_zero_error">त्रुटि: शून्य से विभाजन</string>
     <string name="history">इतिहास</string>
     <string name="history_empty">इतिहास खाली है</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 52ccb849..2067e202 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -3,7 +3,8 @@
     <string name="app_name">Jednostavan kalkulator</string>
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Znanstveni kalkulator</string>
-    <string name="unit_converter">Unit converter</string>
+    <string name="unit_converter">Pretvarač jedinica</string>
+    <string name="swap_units">Zamijeni jedinice</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Greška: dijeljenje s nulom</string>
     <!-- History -->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 23d19cac..1699c73b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Számológép</string>
     <string name="scientific_calculator">Tudományos számológép</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Hiba: nullával való osztás</string>
     <!-- History -->
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index ebd096ed..4023e497 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Kalkulator Sains</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Kesalahan: pembagian dengan nol</string>
     <!-- History -->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 71cedd34..bf654581 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculator</string>
     <string name="scientific_calculator">Vísindareiknivél</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Error: division by zero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8973091f..ba75dd7e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calcolatrice</string>
     <string name="scientific_calculator">Calcolatrice scientifica</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Errore: divisione per zero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index a43f3c5d..381ae8d8 100755
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">מחשבון</string>
     <string name="scientific_calculator">מחשבון מדעי</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">שגיאה: חלוקה באפס</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 526444c0..db1b6426 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">電卓</string>
     <string name="scientific_calculator">科学計算電卓</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">エラー：ゼロによる除算</string>
     <!-- History -->
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index fb5e76b9..0a2e1a55 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">ಕ್ಯಾಲ್ಕುಲೇಟರ್</string>
     <string name="scientific_calculator">ವೈಜ್ಞಾನಿಕ ಕ್ಯಾಲ್ಕುಲೇಟರ್</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">ದೋಷ : ಶೂನ್ಯದಿಂದ ವಿಭಜನೆ</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 1426f176..b0b0cd54 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">계산기</string>
     <string name="scientific_calculator">과학 계산기</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">오류: 0으로 나누기</string>
     <!-- History -->
diff --git a/app/src/main/res/values-kr/strings.xml b/app/src/main/res/values-kr/strings.xml
index 61548581..9153e9eb 100644
--- a/app/src/main/res/values-kr/strings.xml
+++ b/app/src/main/res/values-kr/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">계산기</string>
     <string name="scientific_calculator">공학용 계산기</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
 
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">에러: 공으로 나눌 할수 없어요</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 23cd1674..8d019816 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Skaičiuotuvas</string>
     <string name="scientific_calculator">Mokslinis skaičiuotuvas</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Klaida: dalyba iš nulio</string>
     <!-- History -->
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index e556f56e..576d6e1c 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulators</string>
     <string name="scientific_calculator">Zinātniskais kalkulators</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Kļūda: dalīšana ar nulli</string>
     <!-- History -->
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 786a633a..7abbc1c6 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Калкулатор</string>
     <string name="scientific_calculator">Научен калкулатор</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Грешка: поделба по нула</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index a9983b90..a581ae2d 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">കാൽക്കുലേറ്റർ</string>
     <string name="scientific_calculator">ശാസ്ത്രീയ കാൽക്കുലേറ്റർ</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">പിശക്: 0 കൊണ്ട് ഹരിക്കാനാവില്ല</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 987d4720..73945a85 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Kalkulator Saintifik</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
 
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Amaran: pembahagian dengan sifar</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 4af4cd0f..bff6429f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Rekenmachine</string>
     <string name="scientific_calculator">Wetenschappelijke Rekenmachine</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Fout: delen door nul</string>
     <!-- History -->
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 427c492b..a30513c9 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Vitenskapelig kalkulator</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">FeiL: Deling på null</string>
     <!-- History -->
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 2f30c1c2..8bf116fa 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">کیلکولیٹر</string>
     <string name="scientific_calculator">وگیانک کیلکولیٹر</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">غلطی آئی اے، صفر نال ونڈ</string>
     <!-- History -->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index a3b6f4de..bf36ebae 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Kalkulator naukowy</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Błąd: dzielenie przez zero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c2bd0bbd..49bde4bf 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculadora</string>
     <string name="scientific_calculator">Calculadora Científica</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Erro: divisão por zero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index aba351c3..ad5a02cd 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculadora</string>
     <string name="scientific_calculator">Calculadora científica</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Erro: divisão por zero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 89ec4aa2..09b854a4 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculator</string>
     <string name="scientific_calculator">Calculator Ştiințific</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Eroare: împărțire la zero</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5690bd40..a664f4a1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Калькулятор</string>
     <string name="scientific_calculator">Научный калькулятор</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Ошибка: деление на ноль</string>
     <!-- History -->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index fe81c38e..bddbb976 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulačka</string>
     <string name="scientific_calculator">Vedecká kalkulačka</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Chyba: delenie nulou</string>
     <!-- History -->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index d14d1a96..ac201cf9 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Znanstveni kalkulator</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <string name="formula_divide_by_zero_error">Napaka: deljenje z ničlo</string>
     <string name="history">Zgodovina</string>
     <string name="history_empty">Zgodovina je prazna</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index d2e4f6c3..91e68170 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -3,7 +3,8 @@
     <string name="app_name">Једноставан калкулатор</string>
     <string name="app_launcher_name">Калкулатор</string>
     <string name="scientific_calculator">Научни калкулатор</string>
-    <string name="unit_converter">Unit converter</string>
+    <string name="unit_converter">Претварач јединица</string>
+    <string name="swap_units">Замијени јединице</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Грешка : дељење нулом</string>
     <!-- History -->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index d6cd18de..8a575bf2 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Kalkylator</string>
     <string name="scientific_calculator">Avancerad kalkylator</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Fel: delning med noll</string>
     <!-- History -->
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 3593ae5c..080dd1a2 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">கால்குலேட்டர்</string>
     <string name="scientific_calculator">அறிவியல் கால்குலேட்டர்</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">பிழை: பூஜ்ஜியத்தால் வகுத்தல்</string>
     <!-- History -->
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index a250bca1..2aeeb2aa 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">గనన యంత్రము</string>
     <string name="scientific_calculator">శాస్త్రీయ గనన యంత్రము</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">లోపం: సున్నాతో భాగించటం</string>
     <!-- History -->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 9703de75..10bcc537 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculator</string>
     <string name="scientific_calculator">Scientific Calculator</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
 
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Error: division by zero</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 74821624..8e4a5f52 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Hesap Makinesi</string>
     <string name="scientific_calculator">Bilimsel Hesap Makinesi</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Hata: sıfıra bölme</string>
     <!-- History -->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 6a9e0f5c..e1bce55f 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Калькулятор</string>
     <string name="scientific_calculator">Науковий Калькулятор</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Помилка: ділення на нуль</string>
     <!-- History -->
diff --git a/app/src/main/res/values-zgh/strings.xml b/app/src/main/res/values-zgh/strings.xml
index 817dec6b..aa3e65e7 100644
--- a/app/src/main/res/values-zgh/strings.xml
+++ b/app/src/main/res/values-zgh/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ</string>
     <string name="scientific_calculator">ⵜⴰⵙⵎⵙⵙⵉⴹⵏⵜ ⵜⴰⵎⴰⵙⵙⴰⵏⵜ</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">ⵜⴰⵣⴳⵍⵜ: ⴰⴱⵟⵟⵓ ⵅⴼ ⵓⵎⵢⴰ</string>
     <!-- History -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3993707c..0ffc9418 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">计算器</string>
     <string name="scientific_calculator">科学计算器</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">错误: 被零除</string>
     <!-- History -->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 60edde5b..d08d630f 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">計算機</string>
     <string name="scientific_calculator">科學計算機</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">錯誤：除以零</string>
     <!-- History -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 17eb7619..698ade11 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,6 +4,7 @@
     <string name="app_launcher_name">Calculator</string>
     <string name="scientific_calculator">Scientific Calculator</string>
     <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
 
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Error: division by zero</string>