diff --git a/app/src/main/java/im/conversations/android/ui/fragment/setup/SignInFragment.java b/app/src/main/java/im/conversations/android/ui/fragment/setup/SignInFragment.java
index 3bb96f74c..92d06982e 100644
--- a/app/src/main/java/im/conversations/android/ui/fragment/setup/SignInFragment.java
+++ b/app/src/main/java/im/conversations/android/ui/fragment/setup/SignInFragment.java
@@ -15,10 +15,13 @@ public class SignInFragment extends AbstractSetupFragment {
     public View onCreateView(
             @NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
-        FragmentSignInBinding binding =
+        final FragmentSignInBinding binding =
                 DataBindingUtil.inflate(inflater, R.layout.fragment_sign_in, container, false);
         binding.setSetupViewModel(setupViewModel);
         binding.setLifecycleOwner(getViewLifecycleOwner());
+        final var menu = binding.materialToolbar.getMenu();
+        menu.findItem(R.id.scan_qr_code).setVisible(true);
+        menu.findItem(R.id.certificate_login).setVisible(true);
         return binding.getRoot();
     }
 }
diff --git a/app/src/main/res/drawable/ic_qr_code_scanner_24dp.xml b/app/src/main/res/drawable/ic_qr_code_scanner_24dp.xml
new file mode 100644
index 000000000..3d6820dc6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_qr_code_scanner_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.5,6.5v3h-3v-3H9.5M11,5H5v6h6V5L11,5zM9.5,14.5v3h-3v-3H9.5M11,13H5v6h6V13L11,13zM17.5,6.5v3h-3v-3H17.5M19,5h-6v6h6V5L19,5zM13,13h1.5v1.5H13V13zM14.5,14.5H16V16h-1.5V14.5zM16,13h1.5v1.5H16V13zM13,16h1.5v1.5H13V16zM14.5,17.5H16V19h-1.5V17.5zM16,16h1.5v1.5H16V16zM17.5,14.5H19V16h-1.5V14.5zM17.5,17.5H19V19h-1.5V17.5zM22,7h-2V4h-3V2h5V7zM22,22v-5h-2v3h-3v2H22zM2,22h5v-2H4v-3H2V22zM2,2v5h2V4h3V2H2z" />
+</vector>
diff --git a/app/src/main/res/menu/activity_setup.xml b/app/src/main/res/menu/activity_setup.xml
index 515dd2fca..4ae1af9eb 100644
--- a/app/src/main/res/menu/activity_setup.xml
+++ b/app/src/main/res/menu/activity_setup.xml
@@ -2,9 +2,19 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/account_settings"
-        android:icon="@drawable/ic_settings_24dp"
-        android:title="@string/account_settings"
+        android:id="@+id/scan_qr_code"
+        android:icon="@drawable/ic_qr_code_scanner_24dp"
+        android:title="@string/scan_qr_code"
+        android:visible="false"
         app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/account_settings"
+        android:title="@string/account_settings"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/certificate_login"
+        android:title="@string/certificate_login"
+        android:visible="false"
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 08f82c9b8..08433a720 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1041,5 +1041,6 @@
     <string name="use_opportunistic_tls">Opportunistic TLS (STARTTLS)</string>
     <string name="info_required">Info required</string>
     <string name="invalid">Invalid!</string>
+    <string name="certificate_login">Certificate login</string>
 
 </resources>