fixes after rebase

src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java

@@ -113,7 +113,7 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
         // setup toolbar
         setupToolbar();
         ((CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar)).setTitle(this.getString(R.string.drawer_synced_folders));
-        findViewById(R.id.app_bar).setBackgroundColor(this.getResources().getColor(R.color.listItemHighlighted));
+        findViewById(R.id.app_bar).setBackgroundColor(this.getResources().getColor(R.color.filelist_icon_backgorund));
 
         // setup drawer
         setupDrawer(R.id.nav_synced_folders);

src/main/res/drawable/borderless_btn.xml

@@ -21,7 +21,7 @@
 
     <item
         android:state_enabled="false"
-        android:color="@color/half_black" />
+        android:color="@color/disabled_text" />
 
     <item
         android:color="@color/color_accent"/>

src/main/res/values/colors.xml

@@ -27,6 +27,7 @@
     <color name="fab_white">#fafafa</color>
     <color name="black_semi_transparent">#B2000000</color>
     <color name="textColor">@color/black</color>
+    <color name="disabled_text">#ff888888</color>
     <color name="list_divider_background">#eee</color>
     <color name="filelist_icon_backgorund">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>