diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index 6d681ea5..0c87a21f 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -148,29 +148,25 @@ public class SettingsFragment extends Fragment {
         }
 
         // certs deletion
-        certsFrame.setOnClickListener(new View.OnClickListener() {
+        certsFrame.setOnClickListener(v1 -> {
 
-            @Override
-            public void onClick(View v) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
-                builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle));
-                builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
-                builder.setPositiveButton("YES", new DialogInterface.OnClickListener() {
+            AlertDialog.Builder builder = new AlertDialog.Builder(ctx);
+            builder.setTitle(getResources().getString(R.string.settingsCertsPopupTitle));
+            builder.setMessage(getResources().getString(R.string.settingsCertsPopupMessage));
+            builder.setPositiveButton(R.string.menuDeleteText, (dialog, which) -> {
 
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        ctx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE)
-                                .edit()
-                                .remove(MemorizingTrustManager.KEYSTORE_KEY)
-                                .apply();
+                ctx.getSharedPreferences(MemorizingTrustManager.KEYSTORE_NAME, Context.MODE_PRIVATE)
+                        .edit()
+                        .remove(MemorizingTrustManager.KEYSTORE_KEY)
+                        .apply();
 
-                        MainActivity.logout(Objects.requireNonNull(getActivity()), ctx);
-                    }
-                });
+                MainActivity.logout(Objects.requireNonNull(getActivity()), ctx);
+
+            });
+
+            builder.setNeutralButton(R.string.cancelButton, (dialog, which) -> dialog.dismiss());
+            builder.create().show();
 
-                builder.setNeutralButton("NO", (dialog, which) -> dialog.dismiss());
-                builder.create().show();
-            }
         });
 
         // issues badge switcher
diff --git a/app/src/main/res/drawable/ic_security_24dp.xml b/app/src/main/res/drawable/ic_security_24dp.xml
new file mode 100644
index 00000000..6ffc522d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_security_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#368F73" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 09aec96b..274ee8a1 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -33,7 +33,7 @@
                 layout="@layout/layout_settings_fileview"/>
 
             <View
-                android:id="@+id/certsDivider"
+                android:id="@+id/securityDivider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginStart="44dp"
@@ -43,8 +43,8 @@
                 android:layout_below="@id/fileViewLayout" />
 
             <include
-                android:id="@+id/certsLayout"
-                layout="@layout/layout_settings_certs" />
+                android:id="@+id/securityLayout"
+                layout="@layout/layout_settings_security" />
 
             <View
                 android:id="@+id/translationDivider"
@@ -54,7 +54,7 @@
                 android:layout_marginEnd="5dp"
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="20dp"
-                android:layout_below="@id/certsLayout" />
+                android:layout_below="@id/securityLayout" />
 
             <include
                 android:id="@+id/langLayout"
diff --git a/app/src/main/res/layout/layout_settings_certs.xml b/app/src/main/res/layout/layout_settings_security.xml
similarity index 85%
rename from app/src/main/res/layout/layout_settings_certs.xml
rename to app/src/main/res/layout/layout_settings_security.xml
index 52b4a67b..c06342fe 100644
--- a/app/src/main/res/layout/layout_settings_certs.xml
+++ b/app/src/main/res/layout/layout_settings_security.xml
@@ -5,16 +5,16 @@
     android:layout_height="wrap_content"
     android:id="@+id/layoutSettingsCerts"
     android:orientation="vertical"
-    android:layout_below="@+id/certsDivider"
+    android:layout_below="@+id/securityDivider"
     android:background="?attr/primaryBackgroundColor">
 
     <TextView
-        android:id="@+id/tvCert"
+        android:id="@+id/tvSecurity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableStart="@drawable/ic_lock_open"
+        android:drawableStart="@drawable/ic_security_24dp"
         android:drawablePadding="20dp"
-        android:text="@string/settingsCertsHeader"
+        android:text="@string/settingsSecurityHeader"
         android:textColor="@color/colorDarkGreen"
         android:textSize="14sp"
         android:textStyle="bold" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4ef3a1b..4a173dc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -246,10 +246,10 @@
 
     <!-- settings -->
     <string name="settingsLanguageHeaderText">Translation</string>
-    <string name="settingsCertsHeader">Certificates</string>
-    <string name="settingsCertsSelectorHeader">Delete certificates</string>
-    <string name="settingsCertsPopupTitle">Delete trusted certificates?</string>
-    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? You will also be logged out.</string>
+    <string name="settingsSecurityHeader">Security</string>
+    <string name="settingsCertsSelectorHeader">Delete Trusted Certificates</string>
+    <string name="settingsCertsPopupTitle">Delete Trusted Certificates?</string>
+    <string name="settingsCertsPopupMessage">Are you sure to delete any manually trusted certificate or hostname? \n\nYou will also be logged out.</string>
     <string name="settingsDateTimeHeaderText">Date &amp; Time</string>
     <string name="settingsSave">Settings saved</string>
     <string name="settingsLanguageSelectorHeader">Language</string>