diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index 9e9e83bd3..94cddc273 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -374,7 +374,6 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
         fabCommons.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                Log.d("deneme","deneme");
                 openWebView(place.siteLinks.getCommonsLink()); }
         });
 
diff --git a/app/src/main/res/color/button_color_selector.xml b/app/src/main/res/color/button_color_selector.xml
index e48e36c7c..7f79c5126 100644
--- a/app/src/main/res/color/button_color_selector.xml
+++ b/app/src/main/res/color/button_color_selector.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_enabled="false"
-        android:color="@color/disabled_button_text_color_light" />
+        android:color="@color/opak_middle_grey" />
     <item
         android:color="@color/status_bar_blue" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/text_color_selector.xml b/app/src/main/res/color/text_color_selector.xml
index 15c5b3d6d..4a97c6773 100644
--- a/app/src/main/res/color/text_color_selector.xml
+++ b/app/src/main/res/color/text_color_selector.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_enabled="false"
-        android:color="@color/disabled_button_text_color_light" />
+        android:color="?attr/textDisabled" />
     <item
-        android:color="@color/enabled_button_text_color_light" />
+        android:color="?attr/textEnabled" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-mdpi/button_background_selector.xml b/app/src/main/res/drawable-mdpi/button_background_selector.xml
index 3f5a644f8..bfcb3852b 100644
--- a/app/src/main/res/drawable-mdpi/button_background_selector.xml
+++ b/app/src/main/res/drawable-mdpi/button_background_selector.xml
@@ -2,10 +2,10 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:state_pressed="true"
-        android:drawable="@color/pressed_button_background_light" />
+        android:drawable="@color/pressed_button_light" />
     <item
         android:state_focused="true"
-        android:drawable="@color/focused_button_background_light" />
-    <item
-        android:drawable="@android:color/transparent" />
+        android:drawable="@color/focused_button_light"
+         />
+    <item android:drawable="@android:color/transparent" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bar_more_info.xml b/app/src/main/res/layout/bar_more_info.xml
index ce814727e..b252ff4d2 100644
--- a/app/src/main/res/layout/bar_more_info.xml
+++ b/app/src/main/res/layout/bar_more_info.xml
@@ -5,7 +5,7 @@
     android:id="@+id/more_info_button"
     android:visibility="gone"
     android:layout_gravity="bottom"
-    android:background="@color/default_circle_indicator_stroke_color"
+    android:background="?attr/bottomBar"
     >
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_details.xml b/app/src/main/res/layout/bottom_sheet_details.xml
index f53befb01..0d2399b84 100644
--- a/app/src/main/res/layout/bottom_sheet_details.xml
+++ b/app/src/main/res/layout/bottom_sheet_details.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    android:background="@color/cardview_light_background"
+    android:background="?attr/mainBackground"
     app:layout_behavior="@string/bottom_sheet_behavior"
     app:behavior_peekHeight="128dp"
     app:behavior_hideable="true"
diff --git a/app/src/main/res/layout/bottom_sheet_nearby.xml b/app/src/main/res/layout/bottom_sheet_nearby.xml
index 07727d9ce..11d6762d3 100644
--- a/app/src/main/res/layout/bottom_sheet_nearby.xml
+++ b/app/src/main/res/layout/bottom_sheet_nearby.xml
@@ -5,7 +5,7 @@
     android:id="@+id/bottom_sheet"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    android:background="@color/cardview_light_background"
+    android:background="?attr/mainBackground"
     app:layout_behavior="@string/bottom_sheet_behavior"
     app:behavior_peekHeight="0dp"
     app:behavior_hideable="true"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 38331d635..8d125aa61 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -8,6 +8,13 @@
     <attr name="uploadOverlayBackground" format="reference"/>
     <attr name="spinnerTheme" format="reference"/>
     <attr name="iconsTheme" format="reference"/>
+    <attr name="bottomBar" format="reference"/>
+    <attr name="buttonBackgroundFocused" format="reference"/>
+    <attr name="buttonBackgroundPressed" format="reference"/>
+    <attr name="buttonFocused" format="reference"/>
+    <attr name="buttonPressed" format="reference"/>
+    <attr name="textDisabled" format="reference"/>
+    <attr name="textEnabled" format="reference"/>
 
     <declare-styleable name="CompatTextView">
         <attr name="drawablePadding" format="dimension"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d0d065ec0..b46d7bd01 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -31,10 +31,20 @@
     <color name="upload_overlay_background_dark">#77000000</color>
     <color name="upload_overlay_background_light">#44000000</color>
 
-    <color name="pressed_button_background_light">#64999999</color>
-    <color name="focused_button_background_light">#32999999</color>
+    <color name="pressed_button_light">#64999999</color>
+    <color name="focused_button_light">#32999999</color>
     <color name="disabled_button_text_color_light">#48000000</color>
     <color name="enabled_button_text_color_light">#B0000000</color>
+
+    <color name="pressed_button_dark">#40CCCCCC</color>
+    <color name="focused_button_dark">#26CCCCCC</color>
+    <color name="disabled_button_text_color_dark">#717171</color>
+    <color name="enabled_button_text_color_dark">#FFFFFF</color>
+
     <color name="button_blue">#0c609c</color>
 
+    <color name="bottom_bar_light">#E0E0E0</color>
+    <color name="bottom_bar_dark">#424242</color>
+
+    <color name="opak_middle_grey">#757575</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a7abfc17d..a8eb1d849 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,6 +14,11 @@
         <item name="uploadOverlayBackground">@color/upload_overlay_background_dark</item>
         <item name="spinnerTheme">@style/DarkSpinnerTheme</item>
         <item name="iconsTheme">@color/main_background_light</item>
+        <item name="bottomBar">@color/bottom_bar_dark</item>
+        <item name="buttonBackgroundFocused">@color/focused_button_dark</item>
+        <item name="buttonBackgroundPressed">@color/pressed_button_dark</item>
+        <item name="textDisabled">@color/disabled_button_text_color_dark</item>
+        <item name="textEnabled">@color/enabled_button_text_color_dark</item>
     </style>
 
     <style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
@@ -29,6 +34,11 @@
         <item name="uploadOverlayBackground">@color/upload_overlay_background_light</item>
         <item name="spinnerTheme">@style/LightSpinnerTheme</item>
         <item name="iconsTheme">@color/main_background_dark</item>
+        <item name="bottomBar">@color/bottom_bar_light</item>
+        <item name="buttonBackgroundFocused">@color/focused_button_light</item>
+        <item name="buttonBackgroundPressed">@color/pressed_button_light</item>
+        <item name="textDisabled">@color/disabled_button_text_color_light</item>
+        <item name="textEnabled">@color/enabled_button_text_color_light</item>
     </style>
 
     <style name="DarkSpinnerTheme" parent="DarkAppTheme">