diff --git a/.travis.yml b/.travis.yml
index 1e1610e..8f769e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: false
 android:
   components:
     - build-tools-22.0.1
+    - build-tools-23.0.0
     - android-23
     - android-22
     - extra-android-support
diff --git a/app/build.gradle b/app/build.gradle
index 2412fa4..880dc2c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "22.0.1"
+    buildToolsVersion "23.0.0"
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index e4f58c6..4fc1693 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -6,7 +6,7 @@
     android:layout_marginBottom="6dp"
     android:layout_marginLeft="2dp"
     android:layout_marginRight="2dp"
-    android:layout_marginTop="8dp"
+    android:layout_marginTop="6dp"
     android:layout_weight="1"
     android:background="?attr/searchBackground"
     android:clipChildren="false"
@@ -33,6 +33,6 @@
         android:singleLine="true"
         android:textColor="@color/gray_dark"
         android:textColorHint="@color/hint_text"
-        android:textCursorDrawable="@null"></AutoCompleteTextView>
+        android:textCursorDrawable="@null"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index e33630c..f1d32cb 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -14,8 +14,8 @@
         android:layout_width="match_parent"
         android:layout_height="30dp"
         android:background="@color/black"
-        android:overScrollMode="never"
         android:listSelector="?attr/listBackground"
+        android:overScrollMode="never"
         android:scrollbars="none" />
     <!--
         TODO fucking fix the list selector aka remove it
@@ -25,6 +25,10 @@
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        android:paddingLeft="0dp"
+        android:paddingRight="0dp"
+        android:paddingTop="2dp"
+        android:paddingBottom="0dp"
         custom:contentInsetEnd="0dp"
         custom:contentInsetStart="0dp" />
 
diff --git a/app/src/main/res/layout/toolbar_content.xml b/app/src/main/res/layout/toolbar_content.xml
index 81b5cac..06789f5 100644
--- a/app/src/main/res/layout/toolbar_content.xml
+++ b/app/src/main/res/layout/toolbar_content.xml
@@ -8,7 +8,6 @@
         android:id="@+id/arrow_button"
         android:layout_width="?attr/actionBarSize"
         android:layout_height="?attr/actionBarSize"
-        android:layout_marginTop="2dp"
         android:background="?attr/actionBarItemBackground"
         android:clickable="true"
         android:gravity="center" >