diff --git a/app/src/main/res/layout/generate_password.xml b/app/src/main/res/layout/generate_password.xml
index d307b84be..3e0b4faef 100644
--- a/app/src/main/res/layout/generate_password.xml
+++ b/app/src/main/res/layout/generate_password.xml
@@ -95,7 +95,8 @@
                 android:layout_height="match_parent"
                 android:layout_width="match_parent"
                 android:orientation="vertical"
-                android:layout_marginRight="20dp">
+                android:layout_marginRight="20dp"
+                android:layout_marginEnd="20dp">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -111,6 +112,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_uppercase"
+                        android:layout_toRightOf="@+id/cb_uppercase"
                         android:text="@string/visual_uppercase" />
                 </RelativeLayout>
 
@@ -128,6 +132,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_lowercase"
+                        android:layout_toRightOf="@+id/cb_lowercase"
                         android:text="@string/visual_lowercase" />
                 </RelativeLayout>
 
@@ -145,6 +152,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_digits"
+                        android:layout_toRightOf="@+id/cb_digits"
                         android:text="@string/visual_digits" />
                 </RelativeLayout>
 
@@ -161,6 +171,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_minus"
+                        android:layout_toRightOf="@+id/cb_minus"
                         android:text="@string/visual_minus" />
                 </RelativeLayout>
 
@@ -177,6 +190,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_underline"
+                        android:layout_toRightOf="@+id/cb_underline"
                         android:text="@string/visual_underline" />
                 </RelativeLayout>
 
@@ -193,6 +209,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_space"
+                        android:layout_toRightOf="@+id/cb_space"
                         android:text="@string/visual_space" />
                 </RelativeLayout>
 
@@ -209,6 +228,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_specials"
+                        android:layout_toRightOf="@+id/cb_specials"
                         android:text="@string/visual_special" />
                 </RelativeLayout>
 
@@ -227,6 +249,9 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
                         android:layout_centerVertical="true"
+                        android:gravity="end"
+                        android:layout_toEndOf="@+id/cb_brackets"
+                        android:layout_toRightOf="@+id/cb_brackets"
                         android:text="@string/visual_brackets" />
                 </RelativeLayout>
 
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 89474b307..dfca8a73e 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -98,7 +98,7 @@
     <string name="visual_underline" translatable="false">_</string>
     <string name="visual_space" translatable="false"> </string>
     <string name="visual_special" translatable="false">&amp;\/,^@.#&quot;:%\\='$!*`;+</string>
-    <string name="visual_brackets" translatable="false">(){}&lt;&gt;</string>
+    <string name="visual_brackets" translatable="false">[](){}&lt;&gt;</string>
     <string-array name="list_password_generator_options_default_values">
         <item translatable="false">@string/value_password_uppercase</item>
         <item translatable="false">@string/value_password_lowercase</item>