diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 15f9746a7..4feb3a3d7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,14 +20,14 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.Holo.Light" >
+        android:theme="@style/ConversationsTheme" >
         <service android:name="eu.siacs.conversations.services.XmppConnectionService" />
 
-         <provider
-             android:name="eu.siacs.conversations.services.ImageProvider"
-             android:authorities="eu.siacs.conversations.images"
-             android:exported="true"/>
-        
+        <provider
+            android:name="eu.siacs.conversations.services.ImageProvider"
+            android:authorities="eu.siacs.conversations.images"
+            android:exported="true" />
+
         <receiver android:name="eu.siacs.conversations.services.EventReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -40,9 +40,8 @@
             android:name="eu.siacs.conversations.ui.ConversationActivity"
             android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_conversations"
-            android:windowSoftInputMode="stateHidden"
             android:launchMode="singleTask"
-            android:logo="@drawable/ic_activity">
+            android:windowSoftInputMode="stateHidden" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -52,60 +51,60 @@
         <activity
             android:name="eu.siacs.conversations.ui.SettingsActivity"
             android:label="@string/title_activity_settings"
-            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
-            android:logo="@drawable/ic_activity">
+            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ManageAccountActivity"
-            android:label="@string/title_activity_manage_accounts"
             android:configChanges="orientation|screenSize"
-            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
-            android:logo="@drawable/ic_activity">
+            android:label="@string/title_activity_manage_accounts"
+            android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.MucDetailsActivity"
             android:label="@string/title_activity_conference_details"
-            android:windowSoftInputMode="stateHidden"
-            android:logo="@drawable/ic_activity">
+            android:windowSoftInputMode="stateHidden" >
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ContactDetailsActivity"
             android:label="@string/title_activity_contact_details"
-            android:windowSoftInputMode="stateHidden"
-            android:logo="@drawable/ic_activity">
+            android:windowSoftInputMode="stateHidden" >
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ContactsActivity"
             android:label="@string/title_activity_contacts"
             android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity"
-            android:windowSoftInputMode="stateHidden"
-            android:logo="@drawable/ic_activity">
+            android:windowSoftInputMode="stateHidden" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="de.gultsch.chat.ui.ConversationActivity" />
+
             <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:scheme="imto" />
                 <data android:host="jabber" />
             </intent-filter>
         </activity>
         <activity
             android:name="eu.siacs.conversations.ui.ShareWithActivity"
-            android:label="@string/title_activity_conversations"
-            android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"
-            android:icon="@drawable/ic_activity">
+            android:label="@string/title_activity_conversations" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="text/plain" />
             </intent-filter>
-             <intent-filter>
+            <intent-filter>
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
new file mode 100644
index 000000000..0191d302c
--- /dev/null
+++ b/res/values/themes.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="ConversationsTheme"
+           parent="@android:style/Theme.Holo.Light.DarkActionBar">
+        <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
+        <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
+    </style>
+
+    <style name="ConversationsActionBar"
+           parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+        <item name="android:background">#259b24</item>
+        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
+	<item name="android:icon">@android:color/transparent</item>
+    </style>
+    
+    
+    <style name="ConversationsActionBarWidget"
+    parent="android:Theme.Holo.Light">
+    <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
+    <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
+</style>
+</resources>
+