Merge branch 'hotfix/4.1.1'

Author: subsymbolic

app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "4.1.0"
+    VERSION_NAME = "4.1.1"
 }
 
 android {

app/src/main/res/drawable/ic_bookmark_24px.xml renamed to app/src/main/res/drawable/ic_refresh_24px.xml

@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"
         android:fillColor="#FFFFFF"/>
 </vector>

app/src/main/res/layout/popup_window_browser_menu.xml

@@ -49,17 +49,17 @@
             android:src="@drawable/ic_arrow_forward_24px" />
 
         <ImageButton
-            android:id="@+id/bookmarksPopupMenuItem"
+            android:id="@+id/refreshPopupMenuItem"
             style="@style/BrowserIconMenuItem"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:contentDescription="@string/bookmarksMenuTitle"
-            android:onClick="onBookmarksClicked"
-            android:src="@drawable/ic_bookmark_24px" />
+            android:contentDescription="@string/refresh"
+            android:onClick="onRefreshClicked"
+            android:src="@drawable/ic_refresh_24px" />
 
     </LinearLayout>
-    
+
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
@@ -75,12 +75,12 @@
         app:layout_constraintTop_toBottomOf="@id/header">
 
         <TextView
-            android:id="@+id/refreshPopupMenuItem"
+            android:id="@+id/bookmarksPopupMenuItem"
             style="@style/BrowserTextMenuItem"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onClick="onRefreshClicked"
-            android:text="@string/refresh" />
+            android:onClick="onBookmarksClicked"
+            android:text="@string/bookmarksMenuTitle" />
 
         <TextView
             android:id="@+id/addBookmarksPopupMenuItem"