diff --git a/app/src/main/res/drawable-hdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_google_circles_communities_white_24dp.png
new file mode 100644
index 00000000..fe0da8c4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_google_circles_communities_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_google_circles_white_24dp.png
new file mode 100644
index 00000000..3dd1c738
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_google_circles_white_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_google_plus_box_white_24dp.png
deleted file mode 100644
index f5c05cd8..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_google_plus_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_google_circles_communities_white_24dp.png
new file mode 100644
index 00000000..4c55f3df
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_google_circles_communities_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_google_circles_white_24dp.png
new file mode 100644
index 00000000..566b1a2f
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_google_circles_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_google_plus_box_white_24dp.png
deleted file mode 100644
index d9c9ec68..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_google_plus_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_google_circles_communities_white_24dp.png
new file mode 100644
index 00000000..5604ae0d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_google_circles_communities_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_google_circles_white_24dp.png
new file mode 100644
index 00000000..52baf365
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_google_circles_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_google_plus_box_white_24dp.png
deleted file mode 100644
index 8dd45150..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_google_plus_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_google_circles_communities_white_24dp.png
new file mode 100644
index 00000000..7e1c90b3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_google_circles_communities_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_google_circles_white_24dp.png
new file mode 100644
index 00000000..2bd6b5f9
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_google_circles_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_google_plus_box_white_24dp.png
deleted file mode 100644
index b6b6a813..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_google_plus_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_google_circles_communities_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_google_circles_communities_white_24dp.png
new file mode 100644
index 00000000..6ae095e0
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_google_circles_communities_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_google_circles_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_google_circles_white_24dp.png
new file mode 100644
index 00000000..e6bb6b7c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_google_circles_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_google_plus_box_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_google_plus_box_white_24dp.png
deleted file mode 100644
index 3e1d2f71..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_google_plus_box_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
index 19ad8716..0e2ad4ef 100644
--- a/app/src/main/res/layout/card_author.xml
+++ b/app/src/main/res/layout/card_author.xml
@@ -23,7 +23,8 @@
             android:paddingRight="16dp"
             android:paddingTop="24dp"
             android:text="@string/author"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textColor="?android:textColorSecondary" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -83,7 +84,7 @@
                 android:id="@+id/icon_google_plus"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_google_plus_box_white_24dp"
+                android:src="@drawable/ic_google_circles_white_24dp"
                 tools:ignore="ContentDescription" />
 
             <TextView
diff --git a/app/src/main/res/layout/card_special_thanks.xml b/app/src/main/res/layout/card_special_thanks.xml
index 9202b28a..c4184837 100644
--- a/app/src/main/res/layout/card_special_thanks.xml
+++ b/app/src/main/res/layout/card_special_thanks.xml
@@ -21,7 +21,8 @@
             android:paddingRight="16dp"
             android:paddingTop="24dp"
             android:text="@string/special_thanks_to"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textColor="?android:textColorSecondary" />
 
         <View
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml
index fb43b313..db52cbc1 100644
--- a/app/src/main/res/layout/card_support_development.xml
+++ b/app/src/main/res/layout/card_support_development.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView 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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_gravity="center"
     app:cardBackgroundColor="?cardBackgroundColor"
     app:cardUseCompatPadding="true">
@@ -23,7 +23,8 @@
             android:paddingRight="16dp"
             android:paddingTop="24dp"
             android:text="@string/support_development"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
+            android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+            android:textColor="?android:textColorSecondary" />
 
         <LinearLayout
             android:id="@+id/report_bugs"
@@ -38,10 +39,10 @@
             android:paddingRight="16dp">
 
             <ImageView
+                android:id="@+id/icon_bug_report"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_bug_report_white_24dp"
-                android:id="@+id/icon_bug_report"
                 tools:ignore="ContentDescription" />
 
             <LinearLayout
@@ -81,10 +82,10 @@
             android:paddingRight="16dp">
 
             <ImageView
+                android:id="@+id/icon_google_plus_community"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
-                android:src="@drawable/ic_google_plus_box_white_24dp"
-                android:id="@+id/icon_google_plus_community"
+                android:src="@drawable/ic_google_circles_communities_white_24dp"
                 tools:ignore="ContentDescription" />
 
             <LinearLayout
@@ -124,10 +125,10 @@
             android:paddingRight="16dp">
 
             <ImageView
+                android:id="@+id/icon_flag"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_flag_white_24dp"
-                android:id="@+id/icon_flag"
                 tools:ignore="ContentDescription" />
 
             <LinearLayout
@@ -167,10 +168,10 @@
             android:paddingRight="16dp">
 
             <ImageView
+                android:id="@+id/icon_rate"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_play_shopping_bag_white_24dp"
-                android:id="@+id/icon_rate"
                 tools:ignore="ContentDescription" />
 
             <LinearLayout
@@ -210,10 +211,10 @@
             android:paddingRight="16dp">
 
             <ImageView
+                android:id="@+id/icon_donate"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_attach_money_white_24dp"
-                android:id="@+id/icon_donate"
                 tools:ignore="ContentDescription" />
 
             <LinearLayout