diff --git a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java
index 5b7fac1..ee4c0dd 100644
--- a/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java
+++ b/app/src/main/java/acr/browser/lightning/dialog/LightningDialogBuilder.java
@@ -45,7 +45,7 @@ import acr.browser.lightning.utils.Utils;
  * Created by Stefano Pacifici on 02/09/15, based on Anthony C. Restaino's code.
  */
 public class LightningDialogBuilder {
-    public static final String TAG = "LightningDialogBuilder";
+    private static final String TAG = "LightningDialogBuilder";
 
     public enum NewTab {
         FOREGROUND,
diff --git a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
index 97583c2..5145e48 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/BookmarksFragment.java
@@ -67,7 +67,7 @@ public class BookmarksFragment extends Fragment implements View.OnClickListener,
 
     private static final String TAG = "BookmarksFragment";
 
-    public final static String INCOGNITO_MODE = TAG + ".INCOGNITO_MODE";
+    private final static String INCOGNITO_MODE = TAG + ".INCOGNITO_MODE";
 
     // Managers
     @Inject BookmarkModel mBookmarkManager;
diff --git a/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java b/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java
index 7d077da..62642cf 100644
--- a/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java
+++ b/app/src/main/java/acr/browser/lightning/fragment/TabsFragment.java
@@ -76,8 +76,8 @@ public class TabsFragment extends Fragment implements View.OnClickListener, View
      * Arguments boolean to tell the fragment it is displayed in the drawner or on the tab strip
      * If true, the fragment is in the left drawner in the strip otherwise.
      */
-    public static final String VERTICAL_MODE = TAG + ".VERTICAL_MODE";
-    public static final String IS_INCOGNITO = TAG + ".IS_INCOGNITO";
+    private static final String VERTICAL_MODE = TAG + ".VERTICAL_MODE";
+    private static final String IS_INCOGNITO = TAG + ".IS_INCOGNITO";
 
     private boolean mIsIncognito, mDarkTheme;
     private int mIconColor;
diff --git a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
index dae2a33..a14a919 100644
--- a/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
+++ b/app/src/main/java/acr/browser/lightning/search/SuggestionsAdapter.java
@@ -49,7 +49,7 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable {
 
     private static final Scheduler FILTER_SCHEDULER = Schedulers.newSingleThreadedScheduler();
 
-    static final String CACHE_FILE_TYPE = ".sgg";
+    private static final String CACHE_FILE_TYPE = ".sgg";
 
     private final List<HistoryItem> mFilteredList = new ArrayList<>(5);
 
diff --git a/app/src/main/res/layout/tab_list_item.xml b/app/src/main/res/layout/tab_list_item.xml
index 6cbb5e9..dcbb699 100644
--- a/app/src/main/res/layout/tab_list_item.xml
+++ b/app/src/main/res/layout/tab_list_item.xml
@@ -48,7 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:contentDescription="Delete Tab"
+            android:contentDescription="@string/close_tab"
             app:srcCompat="@drawable/ic_action_delete"/>
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab_list_item_horizontal.xml b/app/src/main/res/layout/tab_list_item_horizontal.xml
index 1651425..545e3a5 100644
--- a/app/src/main/res/layout/tab_list_item_horizontal.xml
+++ b/app/src/main/res/layout/tab_list_item_horizontal.xml
@@ -47,7 +47,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center"
-            android:contentDescription="Delete Tab"
+            android:contentDescription="@string/close_tab"
             app:srcCompat="@drawable/ic_action_delete"/>
     </FrameLayout>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 9fbd09b..1220d29 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -144,7 +144,6 @@
     <string name="title_sign_in">Inloggen</string>
     <string name="hint_username">Gebruiksnaam</string>
     <string name="hint_password">Paswoord</string>
-    <string name="google_suggestions">Zoeksuggesties</string>
     <string name="powered_by_google">Ondersteund door Google</string>
     <string name="http_proxy">HTTP Proxy</string>
     <string-array name="proxy_choices_array">
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a76ab5a..e19b5d9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -131,7 +131,6 @@
     <string name="title_sign_in">Iniciar sessão</string>
     <string name="hint_username">Usuário</string>
     <string name="hint_password">Senha</string>
-    <string name="google_suggestions">Sugestões de pesquisa</string>
     <string name="powered_by_google">Disponibilizado por Google</string>
     <string name="http_proxy">Proxy HTTP</string>
     <string-array name="proxy_choices_array">