diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a0a565851..32b0d31a7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -25,7 +25,9 @@
         </activity>
         <activity
             android:name=".ShareActivity"
-            android:label="@string/title_activity_share" >
+            android:icon="@drawable/ic_launcher"
+            android:label="@string/title_activity_share" 
+            android:theme="@style/NoTitle">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
diff --git a/res/layout/activity_share.xml b/res/layout/activity_share.xml
index 6b4289814..023b43cc9 100644
--- a/res/layout/activity_share.xml
+++ b/res/layout/activity_share.xml
@@ -14,7 +14,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
-
+<!-- Hiding the shadow because we're not doing the Actionbar now
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="12dp"
@@ -22,110 +22,96 @@
             android:background="@drawable/actionbar_top_shadow"
             android:orientation="vertical" >
         </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal"
-        android:orientation="vertical"
-        android:layout_marginBottom="64dip"
-        android:layout_marginLeft="16dip"
-        android:layout_marginRight="16dip"
-        android:layout_marginTop="64dip" 
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        android:paddingTop="8dip"
-        android:paddingBottom="8dip"
-        android:background="@drawable/share_overlay_background_gradient" >
+        -->
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content"
+            android:layout_gravity="fill_horizontal"
+            android:layout_marginBottom="64dip"
+            android:layout_marginLeft="16dip"
+            android:layout_marginRight="16dip"
+            android:layout_marginTop="64dip"
+            android:background="@drawable/share_overlay_background_gradient"
+            android:orientation="vertical"
+            android:paddingBottom="8dip"
+            android:paddingLeft="16dip"
+            android:paddingRight="16dip"
+            android:paddingTop="8dip" >
 
-            <ImageView
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:src="@drawable/ic_download" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" >
+
+                <ImageView
+                    android:layout_width="25dp"
+                    android:layout_height="25dp"
+                    android:src="@drawable/ic_download" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="16dip"
+                    android:layout_marginLeft="8dip"
+                    android:text="@string/upload_overlay_title"
+                    android:textAppearance="?android:attr/textAppearanceLarge"
+                    android:textColor="#818181"
+                    android:textSize="20sp" />
+            </LinearLayout>
 
             <TextView
-                android:textSize="20sp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dip"
-                android:layout_marginLeft="8dip"
-                android:text="@string/upload_overlay_title"
-                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="Title"
+                android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="#818181" />
-        </LinearLayout>
-        
-        
-        
-        
 
-        <TextView
-            android:textColor="#818181"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Title"
-            android:textAppearance="?android:attr/textAppearanceMedium" 
-            />
-        
-        <EditText 
-            android:id="@+id/titleEdit"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:scrollHorizontally="false"
-            android:textColor="#363636"
-            />
-        
-         
-        <LinearLayout 
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:orientation="vertical"
-            android:background="#dadada"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp">
-            
+            <EditText
+                android:id="@+id/titleEdit"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:scrollHorizontally="false"
+                android:singleLine="true"
+                android:textColor="#363636" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="5dp"
+                android:layout_marginTop="5dp"
+                android:background="#dadada"
+                android:orientation="vertical" >
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Description"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="#818181" />
+
+            <EditText
+                android:id="@+id/descEdit"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textMultiLine"
+                android:textColor="#363636" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="5dp"
+                android:layout_marginTop="5dp"
+                android:background="#dadada"
+                android:orientation="vertical" >
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/uploadButton"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:text="Upload" />
         </LinearLayout>
-        
-        <TextView
-            android:textColor="#818181"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Description"
-            android:textAppearance="?android:attr/textAppearanceMedium" 
-           /> 
-        
-        <EditText 
-            android:id="@+id/descEdit"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textMultiLine"
-            android:textColor="#363636"
-            />
-        
-         
-        <LinearLayout 
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:orientation="vertical"
-            android:background="#dadada"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp">
-            
-        </LinearLayout>
-        
-        <Button
-            android:id="@+id/uploadButton"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="Upload"
-            />
-        
-    </LinearLayout>
-    
     </RelativeLayout>
 
 </FrameLayout>
\ No newline at end of file