diff --git a/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java
index 98f8372..6421d82 100644
--- a/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/hakodev/androiditunesapi/ExampleInstrumentedTest.java
@@ -7,7 +7,7 @@ import android.support.test.runner.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Instrumented test, which will execute on an Android device.
diff --git a/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java b/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java
index 9cfd772..4618b0c 100644
--- a/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java
+++ b/app/src/main/java/com/hakodev/androiditunesapi/activities/ArtistListActivity.java
@@ -1,10 +1,10 @@
 package com.hakodev.androiditunesapi.activities;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
 
 import com.hakodev.androiditunesapi.R;
 
@@ -17,6 +17,22 @@ public class ArtistListActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.actionbar_search, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == R.id.action_search) {
+            Toast.makeText(this, "Test", Toast.LENGTH_SHORT).show();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     private void setupTheme() {
         setTheme(R.style.AppTheme);
     }
diff --git a/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java b/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java
index 543e4c1..f775b01 100644
--- a/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java
+++ b/app/src/main/java/com/hakodev/androiditunesapi/models/Artist.java
@@ -1,10 +1,10 @@
-
 package com.hakodev.androiditunesapi.models;
 
-import java.util.List;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
+import java.util.List;
+
 public class Artist {
 
     @SerializedName("resultCount")
diff --git a/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java b/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java
index 4ff16be..801cae4 100644
--- a/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java
+++ b/app/src/main/java/com/hakodev/androiditunesapi/models/Result.java
@@ -1,4 +1,3 @@
-
 package com.hakodev.androiditunesapi.models;
 
 import com.google.gson.annotations.Expose;
diff --git a/app/src/main/res/drawable-hdpi/ic_search.png b/app/src/main/res/drawable-hdpi/ic_search.png
new file mode 100644
index 0000000..407fb1b
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_search.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search.png b/app/src/main/res/drawable-mdpi/ic_search.png
new file mode 100644
index 0000000..55c36f9
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_search.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search.png b/app/src/main/res/drawable-xhdpi/ic_search.png
new file mode 100644
index 0000000..2d270ff
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_search.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.png b/app/src/main/res/drawable-xxhdpi/ic_search.png
new file mode 100644
index 0000000..d0d4d59
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_search.png differ
diff --git a/app/src/main/res/drawable/branded_launch.xml b/app/src/main/res/drawable/branded_launch.xml
index 15c57eb..0851888 100644
--- a/app/src/main/res/drawable/branded_launch.xml
+++ b/app/src/main/res/drawable/branded_launch.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
     android:opacity="opaque">
-    <item
-        android:drawable="@color/colorBackground"/>
+    <item android:drawable="@color/colorBackground" />
 </layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
deleted file mode 100644
index affc7ba..0000000
--- a/app/src/main/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
-</vector>
diff --git a/app/src/main/res/menu/actionbar_search.xml b/app/src/main/res/menu/actionbar_search.xml
new file mode 100644
index 0000000..c7b5775
--- /dev/null
+++ b/app/src/main/res/menu/actionbar_search.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search"
+        android:orderInCategory="100"
+        android:title="@string/search"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09b..c9ad5f9 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09b..c9ad5f9 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cb8cbcc..efa5e36 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
+    <!-- Common terms -->
     <string name="app_name">Artist Vault</string>
+    <string name="search">Buscar</string>
 </resources>
diff --git a/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java b/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java
index 1257c5e..b8b382f 100644
--- a/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java
+++ b/app/src/test/java/com/hakodev/androiditunesapi/ExampleUnitTest.java
@@ -2,7 +2,7 @@ package com.hakodev.androiditunesapi;
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Example local unit test, which will execute on the development machine (host).