replaced material icons with svg

AppKit/Themes/Aristo3/ThemeDescriptors.j

@@ -181,43 +181,6 @@ var themedButtonValues = nil,
 + (CPFont)themedFont
 {
     var font = [CPFont systemFontOfSize:12],
-//        themeFontStyle = @"@font-face { font-family: 'SFNSText'; src: local('.SFNSText-Light'), url('Resources/fonts/SFNSText-Light.woff') format('woff'); font-weight: 300 }\n"
-//                       + @"@font-face { font-family: 'SFNSText'; src: local('.SFNSText-Medium'), url('Resources/fonts/SFNSText-Medium.woff') format('woff'); font-weight: 500 }\n"
-//                       + @"@font-face { font-family: 'SFNSDisplay'; src: local('.SFNSDisplay-Light'), url('Resources/fonts/SFNSDisplay-Light.woff') format('woff'); font-weight: 300 }\n"
-//                       + @"@font-face { font-family: 'SFNSDisplay'; src: local('.SFNSDisplay-Medium'), url('Resources/fonts/SFNSDisplay-Medium.woff') format('woff'); font-weight: 500 }\n"
-//                       + @"@font-face { font-family: 'SFNSText'; src: local('.SFNSText'), url('Resources/fonts/SFNSText-Regular.woff') format('woff'); font-weight: 400 }\n"
-//                       + @"@font-face { font-family: 'SFNSText'; src: local('.SFNSText-Bold'), url('Resources/fonts/SFNSText-Bold.woff') format('woff'); font-weight: 600 }\n"
-//                       + @"@font-face { font-family: 'SFNSDisplay'; src: local('.SFNSDisplay'), url('Resources/fonts/SFNSDisplay-Regular.woff') format('woff'); font-weight: 400 }\n"
-//                       + @"@font-face { font-family: 'SFNSDisplay'; src: local('.SFNSDisplay-Bold'), url('Resources/fonts/SFNSDisplay-Bold.woff') format('woff'); font-weight: 600 }\n"
-//                       + @"html, body, h1, p { text-rendering: optimizeLegibility; }\n"
-//                       + @"@font-face {\n"
-//                       + @"font-family: 'Material Icons';\n"
-//                       + @"font-style: normal;\n"
-//                       + @"font-weight: 400;\n"
-//                       + @"src: url(Resources/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */\n"
-//                       + @"src: local('Material Icons'),\n"
-//                       + @"local('MaterialIcons-Regular'),\n"
-//                       + @"url(Resources/fonts/MaterialIcons-Regular.woff2) format('woff2'),\n"
-//                       + @"url(Resources/fonts/MaterialIcons-Regular.woff) format('woff'),\n"
-//                       + @"url(Resources/fonts/MaterialIcons-Regular.ttf) format('truetype');\n"
-//                       + @"}\n"
-//                       + @".material-icons {\n"
-//                       + @"font-family: 'Material Icons';\n"
-//                       + @"font-weight: normal;\n"
-//                       + @"font-style: normal;\n"
-//                       + @"font-size: 24px;\n"
-//                       + @"display: inline-block;\n"
-//                       + @"line-height: 1;\n"
-//                       + @"text-transform: none;\n"
-//                       + @"letter-spacing: normal;\n"
-//                       + @"word-wrap: normal;\n"
-//                       + @"white-space: nowrap;\n"
-//                       + @"direction: ltr;\n"
-//                       + @"-webkit-font-smoothing: antialiased;\n"
-//                       + @"text-rendering: optimizeLegibility;\n"
-//                       + @"-moz-osx-font-smoothing: grayscale;\n"
-//                       + @"font-feature-settings: 'liga';\n"
-//                       + @"}";
 
     themeFontStyle = @"@font-face { font-family: 'SFNSText'; src: local('.SFNSText-Light'), url('%%/fonts/SFNSText-Light.woff') format('woff'); font-weight: 300 }\n"
                    + @"@font-face { font-family: 'SFNSText'; src: local('.SFNSText-Medium'), url('%%/fonts/SFNSText-Medium.woff') format('woff'); font-weight: 500 }\n"
@@ -227,36 +190,6 @@ var themedButtonValues = nil,
                    + @"@font-face { font-family: 'SFNSText'; src: local('.SFNSText-Bold'), url('%%/fonts/SFNSText-Bold.woff') format('woff'); font-weight: 600 }\n"
                    + @"@font-face { font-family: 'SFNSDisplay'; src: local('.SFNSDisplay'), url('%%/fonts/SFNSDisplay-Regular.woff') format('woff'); font-weight: 400 }\n"
                    + @"@font-face { font-family: 'SFNSDisplay'; src: local('.SFNSDisplay-Bold'), url('%%/fonts/SFNSDisplay-Bold.woff') format('woff'); font-weight: 600 }\n"
-                   + @"html, body, h1, p { text-rendering: optimizeLegibility; }\n"
-                   + @"@font-face {\n"
-                   + @"font-family: 'Material Icons';\n"
-                   + @"font-style: normal;\n"
-                   + @"font-weight: 400;\n"
-                   + @"src: url(%%/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */\n"
-                   + @"src: local('Material Icons'),\n"
-                   + @"local('MaterialIcons-Regular'),\n"
-                   + @"url(%%/fonts/MaterialIcons-Regular.woff2) format('woff2'),\n"
-                   + @"url(%%/fonts/MaterialIcons-Regular.woff) format('woff'),\n"
-                   + @"url(%%/fonts/MaterialIcons-Regular.ttf) format('truetype');\n"
-                   + @"}\n";
-
-    //    + @".material-icons {\n"
-//    + @"font-family: 'Material Icons';\n"
-//    + @"font-weight: normal;\n"
-//    + @"font-style: normal;\n"
-//    + @"font-size: 24px;\n"
-//    + @"display: inline-block;\n"
-//    + @"line-height: 1;\n"
-//    + @"text-transform: none;\n"
-//    + @"letter-spacing: normal;\n"
-//    + @"word-wrap: normal;\n"
-//    + @"white-space: nowrap;\n"
-//    + @"direction: ltr;\n"
-//    + @"-webkit-font-smoothing: antialiased;\n"
-//    + @"text-rendering: optimizeLegibility;\n"
-//    + @"-moz-osx-font-smoothing: grayscale;\n"
-//    + @"font-feature-settings: 'liga';\n"
-//    + @"}";
 
     [self registerThemeValues:[
                                [@"system-font-face", @"SFNSText, Helvetica Neue"],
@@ -7019,12 +6952,21 @@ var themedButtonValues = nil,
 
      // WARNING : Those are also used as template images for buttons, etc.
      //           See Cib/_CPCibCustomResource.j and NSCustomResource.j (nib2cib)
-     [@"button-image-plus",         [CPImage imageWithMaterialIconNamed:@"add"      size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,0.85)"]]],
-     [@"button-image-minus",        [CPImage imageWithMaterialIconNamed:@"remove"   size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,0.85)"]]],
-     // [@"button-image-action",       [CPImage imageWithMaterialIconNamed:@"settings" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,0.85)"]]],
+     [@"button-image-plus",         [CPImage imageWithCSSDictionary:@{
+                                                                        @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgdmVyc2lvbj0iMS4xIgogICB3aWR0aD0iMTYiCiAgIGhlaWdodD0iMTYiCiAgIHZpZXdCb3g9IjAgMCAxNiAxNiIKICAgaWQ9InN2ZzEyMiIKICAgc29kaXBvZGk6ZG9jbmFtZT0icGx1cy5zdmciCiAgIGlua3NjYXBlOnZlcnNpb249IjEuMGJldGExICgzMmQ0ODEyLCAyMDE5LTA5LTE5KSI+CiAgPG1ldGFkYXRhCiAgICAgaWQ9Im1ldGFkYXRhMTI4Ij4KICAgIDxyZGY6UkRGPgogICAgICA8Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+CiAgICAgICAgPGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+CiAgICAgICAgPGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPgogICAgICAgIDxkYzp0aXRsZSAvPgogICAgICA8L2NjOldvcms+CiAgICA8L3JkZjpSREY+CiAgPC9tZXRhZGF0YT4KICA8ZGVmcwogICAgIGlkPSJkZWZzMTI2IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICB1bml0cz0icHgiCiAgICAgcGFnZWNvbG9yPSIjZmZmZmZmIgogICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIGJvcmRlcm9wYWNpdHk9IjEiCiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIKICAgICBncmlkdG9sZXJhbmNlPSIxMCIKICAgICBndWlkZXRvbGVyYW5jZT0iMTAiCiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiCiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9Ijc0MSIKICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSI0ODAiCiAgICAgaWQ9Im5hbWVkdmlldzEyNCIKICAgICBzaG93Z3JpZD0iZmFsc2UiCiAgICAgc2hvd2d1aWRlcz0iZmFsc2UiCiAgICAgd2lkdGg9IjExaW4iCiAgICAgaW5rc2NhcGU6em9vbT0iMi40MzI5MjU4IgogICAgIGlua3NjYXBlOmN4PSItNzguMDQyNjA3IgogICAgIGlua3NjYXBlOmN5PSI0LjM2MzgyOTYiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjQ2IgogICAgIGlua3NjYXBlOndpbmRvdy15PSIyNSIKICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIwIgogICAgIGlua3NjYXBlOmN1cnJlbnQtbGF5ZXI9InN2ZzEyMiIgLz4KICA8ZwogICAgIGlkPSJnMTEwIgogICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMDIxNjk4NDEsMCwwLDAuMDIyNzQ0NSwyLjUwODc5ODYsMS45MDY5ODg5KSIgLz4KICA8cGF0aAogICAgIGQ9Ik0gOC45MjEwMjQxLDYuODMxMDM3IEggMTIuMjYyNTgxIFYgOC42Mjc2NzEgSCA4LjkyMTAyNDEgWiIKICAgICBmaWxsPSIjMDAwMDAwIgogICAgIGlkPSJwYXRoMTEyIgogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgc3R5bGU9InN0cm9rZS13aWR0aDowLjAyMjIxNTMiIC8+CiAgPHBhdGgKICAgICBkPSJNIDMuODY0Mzg0OCw2LjgzMTQ5MiBIIDcuMjA3MDI0MSBWIDguNjI3NjQ4IEggMy44NjQzODQ4IFoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDExNCIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgogIDxwYXRoCiAgICAgZD0ibSA3LjIwNzA0NjEsOC42MjcxOTQgaCAxLjcxNDE5NiB2IDMuNTAzNzkgaCAtMS43MTQxOTYgeiIKICAgICBmaWxsPSIjMDAwMDAwIgogICAgIGlkPSJwYXRoMTE2IgogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgc3R5bGU9InN0cm9rZS13aWR0aDowLjAyMjIxNTMiIC8+CiAgPHBhdGgKICAgICBkPSJtIDcuMjA3MDQ2MSwzLjMyNzkyODkgaCAxLjcxNDE5NiBWIDYuODMxNTE1IGggLTEuNzE0MTk2IHoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDExOCIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgogIDxwYXRoCiAgICAgZD0ibSA3LjIwNzA0NjEsNi44MzE0OTIgaCAxLjcxNDE5NiB2IDEuNzk2MTU2IGggLTEuNzE0MTk2IHoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDEyMCIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgo8L3N2Zz4K')"
+                                                                        }
+                                                     beforeDictionary:nil
+                                                      afterDictionary:nil
+                                                                 size:CGSizeMake(16,16)]],
+     [@"button-image-minus",        [CPImage imageWithCSSDictionary:@{
+                                                                        @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgdmVyc2lvbj0iMS4xIgogICB3aWR0aD0iMTYiCiAgIGhlaWdodD0iMTYiCiAgIHZpZXdCb3g9IjAgMCAxNiAxNiIKICAgaWQ9InN2ZzEyMiIKICAgc29kaXBvZGk6ZG9jbmFtZT0ibWludXMuc3ZnIgogICBpbmtzY2FwZTp2ZXJzaW9uPSIxLjBiZXRhMSAoMzJkNDgxMiwgMjAxOS0wOS0xOSkiPgogIDxtZXRhZGF0YQogICAgIGlkPSJtZXRhZGF0YTEyOCI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgICA8ZGM6dGl0bGU+PC9kYzp0aXRsZT4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGRlZnMKICAgICBpZD0iZGVmczEyNiIgLz4KICA8c29kaXBvZGk6bmFtZWR2aWV3CiAgICAgdW5pdHM9InB4IgogICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIKICAgICBib3JkZXJjb2xvcj0iIzY2NjY2NiIKICAgICBpbmtzY2FwZTpkb2N1bWVudC1yb3RhdGlvbj0iMCIKICAgICBib3JkZXJvcGFjaXR5PSIxIgogICAgIG9iamVjdHRvbGVyYW5jZT0iMTAiCiAgICAgZ3JpZHRvbGVyYW5jZT0iMTAiCiAgICAgZ3VpZGV0b2xlcmFuY2U9IjEwIgogICAgIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwIgogICAgIGlua3NjYXBlOnBhZ2VzaGFkb3c9IjIiCiAgICAgaW5rc2NhcGU6d2luZG93LXdpZHRoPSI3NDEiCiAgICAgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iNDgwIgogICAgIGlkPSJuYW1lZHZpZXcxMjQiCiAgICAgc2hvd2dyaWQ9ImZhbHNlIgogICAgIHNob3dndWlkZXM9ImZhbHNlIgogICAgIHdpZHRoPSIxMWluIgogICAgIGlua3NjYXBlOnpvb209IjQuODQ0NDE2MSIKICAgICBpbmtzY2FwZTpjeD0iLTE4Ljk4NjUzNyIKICAgICBpbmtzY2FwZTpjeT0iMTIuODI3MTgyIgogICAgIGlua3NjYXBlOndpbmRvdy14PSI0NiIKICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMjUiCiAgICAgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMCIKICAgICBpbmtzY2FwZTpjdXJyZW50LWxheWVyPSJzdmcxMjIiIC8+CiAgPGcKICAgICBpZD0iZzExMCIKICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjAyMTY5ODQxLDAsMCwwLjAyMjc0NDUsMi41MDg3OTg2LDEuOTA2OTg4OSkiIC8+CiAgPHBhdGgKICAgICBkPSJNIDguOTIxMDI0MSw2LjgzMTAzNyBIIDEyLjI2MjU4MSBWIDguNjI3NjcxIEggOC45MjEwMjQxIFoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDExMiIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgogIDxwYXRoCiAgICAgZD0iTSAzLjg2NDM4NDgsNi44MzE0OTIgSCA3LjIwNzAyNDEgViA4LjYyNzY0OCBIIDMuODY0Mzg0OCBaIgogICAgIGZpbGw9IiMwMDAwMDAiCiAgICAgaWQ9InBhdGgxMTQiCiAgICAgaW5rc2NhcGU6Y29ubmVjdG9yLWN1cnZhdHVyZT0iMCIKICAgICBzdHlsZT0ic3Ryb2tlLXdpZHRoOjAuMDIyMjE1MyIgLz4KICA8cGF0aAogICAgIGQ9Im0gNy4yMDcwNDYxLDYuODMxNDkyIGggMS43MTQxOTYgdiAxLjc5NjE1NiBoIC0xLjcxNDE5NiB6IgogICAgIGZpbGw9IiMwMDAwMDAiCiAgICAgaWQ9InBhdGgxMjAiCiAgICAgaW5rc2NhcGU6Y29ubmVjdG9yLWN1cnZhdHVyZT0iMCIKICAgICBzdHlsZT0ic3Ryb2tlLXdpZHRoOjAuMDIyMjE1MyIgLz4KPC9zdmc+Cg==')"
+                                                                        }
+                                                     beforeDictionary:nil
+                                                      afterDictionary:nil
+                                                                 size:CGSizeMake(16,16)]],
 
      [@"button-image-action",       [CPImage imageWithCSSDictionary:@{
-                                                                        @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgaW5rc2NhcGU6dmVyc2lvbj0iMS4wYmV0YTEgKDMyZDQ4MTIsIDIwMTktMDktMTkpIgogICBzb2RpcG9kaTpkb2NuYW1lPSJnZWFyLnN2ZyIKICAgaWQ9InN2ZzEyIgogICB2ZXJzaW9uPSIxLjEiCiAgIHZpZXdCb3g9Ii05IC05IDE4IDE4Ij4KICA8bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGExOCI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGRlZnMKICAgICBpZD0iZGVmczE2IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICBpbmtzY2FwZTpzbmFwLW90aGVycz0iZmFsc2UiCiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnMTIiCiAgICAgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMjUiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjQ3IgogICAgIGlua3NjYXBlOmN5PSIwLjA3MzIyMjY3OSIKICAgICBpbmtzY2FwZTpjeD0iMjYuODkyNzIzIgogICAgIGlua3NjYXBlOnpvb209IjE3LjMwOTE0MSIKICAgICBzaG93Z3JpZD0iZmFsc2UiCiAgICAgaWQ9Im5hbWVkdmlldzE0IgogICAgIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjkwNyIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjE2MDAiCiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIKICAgICBpbmtzY2FwZTpwYWdlb3BhY2l0eT0iMCIKICAgICBndWlkZXRvbGVyYW5jZT0iMTAiCiAgICAgZ3JpZHRvbGVyYW5jZT0iMTAiCiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIKICAgICBib3JkZXJvcGFjaXR5PSIxIgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IgogICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIgLz4KICA8cGF0aAogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgaWQ9InBhdGgxMCIKICAgICBzdHlsZT0iZmlsbC1ydWxlOmV2ZW5vZGQiCiAgICAgZD0ibSAxLjIzMzUzNjUsLTIuMjczMzYyNCAxLjgyLC0wLjM5IDAuNTIsMS4yNyAtMS41NiwxLjAxMDAwMDA0IGEgNC41LDQuNSAwIDAgMSAwLDEuNDU5OTk5OTYgdiAwIGwgMS41NiwxLjAxIC0wLjUyLDEuMjcgLTEuODIsLTAuMzkgYSA0LjUsNC41IDAgMCAxIC0xLjA0MDAwMDAxLDEuMDQgdiAwIGwgMC4zOSwxLjgyIC0xLjI3LDAuNTIgLTEuMDA5OTk5OTksLTEuNTYgYSA0LjUsNC41IDAgMCAxIC0xLjQ2LDAgdiAwIGwgLTEuMDEsMS41NiAtMS4yNywtMC41MiAwLjM5LC0xLjgyIGEgNC41LDQuNSAwIDAgMSAtMS4wNCwtMS4wNCB2IDAgbCAtMS44MiwwLjM5IC0wLjUyLC0xLjI3IDEuNTYsLTEuMDEgYSA0LjUsNC41IDAgMCAxIDAsLTEuNDU5OTk5OTYgdiAwIGwgLTEuNTYsLTEuMDEwMDAwMDQgMC41MiwtMS4yNyAxLjgyLDAuMzkgYSA0LjUsNC41IDAgMCAxIDEuMDQsLTEuMDQgdiAwIGwgLTAuMzksLTEuODIgMS4yNywtMC41MiAxLjAxLDEuNTYgYSA0LjUsNC41IDAgMCAxIDEuNDYsMCB2IDAgbCAxLjAwOTk5OTk5LC0xLjU2IDEuMjcsMC41MiAtMC4zOSwxLjgyIGEgNC41LDQuNSAwIDAgMSAxLjA0MDAwMDAxLDEuMDQgTSAwLjA3MzUzNjQ5LDAuMzQ2NjM3NjQgYSAyLjUsMi41IDAgMCAwIC00Ljk5OTk5OTk5LDAgMi41LDIuNSAwIDAgMCA0Ljk5OTk5OTk5LDAgeiIgLz4KICA8cGF0aAogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgZD0ibSA0LjU3NjY0MSwtMS40MzE3NDQ4IGMgMC42NTY0NDI0LDAuOTY5ODE4MTUgMS4zMzAxNzU4LDEuOTI5NjQ3MTcgMS45MzM3NjA4LDIuOTMzNzg3OSAwLjA2MzkxOSwwLjEzNTY4MyAwLjA5NDAyNSwwLjI0MDU0MzUgMC4xNTU0NzA0LDAuMDU4NTQ0IDAuNTM2MDc4OSwtMS4wMTY3MDE1NCAxLjA3MjE1NzksLTIuMDMzNDAzMTIgMS42MDgyMzY4LC0zLjA1MDEwNDciCiAgICAgc3R5bGU9ImZpbGw6bm9uZTtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MXB4O3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1vcGFjaXR5OjEiCiAgICAgaWQ9InBhdGgyNCIgLz4KPC9zdmc+Cg==')"
+                                                                        @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgdmVyc2lvbj0iMS4xIgogICB3aWR0aD0iMTYiCiAgIGhlaWdodD0iMTYiCiAgIHZpZXdCb3g9IjAgMCAxNiAxNiIKICAgaWQ9InN2ZzEyMiIKICAgc29kaXBvZGk6ZG9jbmFtZT0iZ2Vhci5zdmciCiAgIGlua3NjYXBlOnZlcnNpb249IjEuMGJldGExICgzMmQ0ODEyLCAyMDE5LTA5LTE5KSI+CiAgPG1ldGFkYXRhCiAgICAgaWQ9Im1ldGFkYXRhMTI4Ij4KICAgIDxyZGY6UkRGPgogICAgICA8Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+CiAgICAgICAgPGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+CiAgICAgICAgPGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPgogICAgICAgIDxkYzp0aXRsZT48L2RjOnRpdGxlPgogICAgICA8L2NjOldvcms+CiAgICA8L3JkZjpSREY+CiAgPC9tZXRhZGF0YT4KICA8ZGVmcwogICAgIGlkPSJkZWZzMTI2IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICB1bml0cz0icHgiCiAgICAgcGFnZWNvbG9yPSIjZmZmZmZmIgogICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIGJvcmRlcm9wYWNpdHk9IjEiCiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIKICAgICBncmlkdG9sZXJhbmNlPSIxMCIKICAgICBndWlkZXRvbGVyYW5jZT0iMTAiCiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiCiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9Ijc2NCIKICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSI0ODAiCiAgICAgaWQ9Im5hbWVkdmlldzEyNCIKICAgICBzaG93Z3JpZD0iZmFsc2UiCiAgICAgc2hvd2d1aWRlcz0iZmFsc2UiCiAgICAgd2lkdGg9IjExaW4iCiAgICAgaW5rc2NhcGU6em9vbT0iNC44NDQ0MTYxIgogICAgIGlua3NjYXBlOmN4PSItMTUuODkwMTg5IgogICAgIGlua3NjYXBlOmN5PSIxMi44MjcxODIiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjQ2IgogICAgIGlua3NjYXBlOndpbmRvdy15PSIyNSIKICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIwIgogICAgIGlua3NjYXBlOmN1cnJlbnQtbGF5ZXI9InN2ZzEyMiIgLz4KICA8ZwogICAgIGlkPSJnMTEwIgogICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMDI2MTc3MzMsMCwwLDAuMDMxMDQxNDUsMi41Nzg5MTk5LC0wLjQ4NjI5NjA2KSIgLz4KICA8cGF0aAogICAgIGQ9Im0gMTIuNTQ1MjE4LDcuNDYxMjY2NiAzZS00LC0wLjAxNDgyIGMgMCwtMC41MDQxNDI0IC0wLjA2NDA1LC0wLjk5MzYxNjggLTAuMTgyNTQzLC0xLjQ2MTkyMiBMIDEwLjgwNjk2OSw2LjE0MDU3NjEgQSA0LjU4MTI5NjYsNC40ODk0OTcxIDAgMCAwIDEwLjU3NTM1OSw1LjU0MzEzNiBMIDExLjg0NTQzOCw0LjY0ODg2NTcgQSA2LjE4NTU5OTEsNi4wNjE2NTI4IDAgMCAwIDEwLjk4MjU2NSwzLjQyNTEwMzQgTCA5LjY3OTAwMjcsNC4yNzE3NDE5IEEgNC42NTE2NTkzLDQuNTU4NDUgMCAwIDAgOS4xOTEyNTksMy44NDgxOTY3IEwgOS44OTE4LDIuNDc3NzU4NCBBIDYuMTUzMDQwNyw2LjAyOTc0NyAwIDAgMCA4LjU0ODQyNjMsMS43ODUyMDU1IEwgNy43OTU0MjEzLDMuMTI4ODc5MSBBIDQuNTk4MTE1Nyw0LjUwNTk3OTMgMCAwIDAgNy4xNjIxNTU4LDIuOTc2NzU5NSBMIDcuMTMyNjgzOCwxLjQ0NDk3NzUgQyA2Ljg4MzQ4MjEsMS40MTUxODg4IDYuNjMwNTc3MiwxLjM5Nzk1MDQgNi4zNzMzNTIsMS4zOTc5NTA0IGMgLTAuMjU3MjI1NSwwIC0wLjUxMDEzMDQsMC4wMTcyNCAtMC43NTkwMjMyLDAuMDQ3MTc4IEwgNS41ODQ4NTU5LDIuOTc2OTEwOCBBIDQuNTkyNTYwOCw0LjUwMDUzNTYgMCAwIDAgNC45NTE1OTEsMy4xMjkwMzAzIEwgNC4xOTg1ODYyLDEuNzg1MzU2NyBhIDYuMTUzMDQwNyw2LjAyOTc0NyAwIDAgMCAtMS4zNDMzNzM4LDAuNjkyNTUzIGwgMC43MDA1NDIsMS4zNzA0MzgyIEEgNC42NTE2NTkzLDQuNTU4NDUgMCAwIDAgMy4wNjc5OTgyLDQuMjcxODkzOSBMIDEuNzY0NDM1LDMuNDI1MjU1NSBBIDYuMTc5NDI2OCw2LjA1NTYwNDIgMCAwIDAgMC45MDE1NjUwNCw0LjY0OTAxNzYgTCAyLjE3MTY0NCw1LjU0MzI4ODEgQSA0LjU4MTI5NjYsNC40ODk0OTcxIDAgMCAwIDEuOTQwMDMzMSw2LjE0MDcyODQgTCAwLjM4NDAyODI0LDUuOTg0Njc3IEEgNi4xNzI3OTE3LDYuMDQ5MTAyMSAwIDAgMCAwLjIwMTE3NzQzLDcuNDQ2NDQ3OCBjIDAsMC4wMDQ5OSAyLjk4OTFlLTQsMC4wMDk4MiA0LjY2OTVlLTQsMC4wMTQ4MiBMIDEuNzUwMjQzLDcuNjc0NjI4MiBjIDAuMDEwOTUzLDAuMjE1NzgwMSAwLjAzODExMywwLjQyNzQ3NzQgMC4wNzg2OTQsMC42MzQzMzYgTCAwLjM3NzA4ODYxLDguODc5NDg5MSBBIDYuMTI1ODgzNCw2LjAwMzEzMzcgMCAwIDAgMC45MTUzMDE4OSwxMC4yNzAzNCBMIDIuMzg4MTM3Miw5Ljc1Mzk0ODggYSA0LjY0MzMyNjgsNC41NTAyODQ0IDAgMCAwIDAuMzcwNzkzMSwwLjUyNTMxMzIgbCAtMS4wMTQ1NTA3LDEuMTY2IGEgNi4yMDczNTU5LDYuMDgyOTczOSAwIDAgMCAxLjEzNTUyNTYsMC45ODcxMTQgbCAxLjA1ODk5MDcsLTEuMTI3NzQyIGEgNC42MTQ0NzIxLDQuNTIyMDA3OSAwIDAgMCAwLjU3NzI1MjUsMC4yOTcxMzIgbCAtMC4zNDU2NTA1LDEuNDk1MDM3IGEgNi4xMjQ4MDMyLDYuMDAyMDc1MSAwIDAgMCAxLjQ3NDA2OTcsMC4zNTQ3NDUgbCAwLjQwMzA0MywtMS40ODExMjUgYyAwLjEwNzcwMzcsMC4wMDc0IDAuMjE2MDI2LDAuMDEyNCAwLjMyNTczNjYsMC4wMTI0IDAuMTA5NzEwMiwwIDAuMjE4MDMyLC0wLjAwNTEgMC4zMjU3MzYzLC0wLjAxMjQgbCAwLjQwMzA0MzEsMS40ODExMjUgQSA2LjEzNzYxMDMsNi4wMTQ2MjU3IDAgMCAwIDguNTc2MTk2MSwxMy4wOTY4MDMgTCA4LjIzMDU1NDIsMTEuNjAxNzY2IGEgNC42MzQ5OTQ0LDQuNTQyMTE5IDAgMCAwIDAuNTc3MjUxOSwtMC4yOTcxMzIgbCAxLjA1ODk5MTMsMS4xMjc3NDIgYSA2LjIwNzM1NTksNi4wODI5NzM5IDAgMCAwIDEuMTM1NTI2NiwtMC45ODcxMTQgbCAtMS4wMTQ1NTE1LC0xLjE2NiBBIDQuNjQzMzI2OCw0LjU1MDI4NDQgMCAwIDAgMTAuMzU4NTY2LDkuNzUzOTUwNyBMIDExLjgzMTU1NSwxMC4yNzAzNCBBIDYuMTI1ODgzNCw2LjAwMzEzMzcgMCAwIDAgMTIuMzY5NzczLDguODc5NDg4MSBMIDEwLjkxNzkyNCw4LjMwODk2MzUgYyAwLjA0MDc0LC0wLjIwNjg1ODYgMC4wNjLine truncated
                                                                         }
                                                      beforeDictionary:nil
                                                       afterDictionary:nil
@@ -7032,9 +6974,24 @@ var themedButtonValues = nil,
 
 
 
-     [@"button-image-plus",         [CPImage imageWithMaterialIconNamed:@"add"      size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,1.00)"]],     CPThemeStateHighlighted],
-     [@"button-image-minus",        [CPImage imageWithMaterialIconNamed:@"remove"   size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,1.00)"]],     CPThemeStateHighlighted],
-     [@"button-image-action",       [CPImage imageWithMaterialIconNamed:@"settings" size:CGSizeMake(16,16) color:[CPColor colorWithCSSString:@"rgba(0,0,0,1.00)"]],     CPThemeStateHighlighted]
+     [@"button-image-plus",         [CPImage imageWithCSSDictionary:@{
+                                                                        @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgdmVyc2lvbj0iMS4xIgogICB3aWR0aD0iMTYiCiAgIGhlaWdodD0iMTYiCiAgIHZpZXdCb3g9IjAgMCAxNiAxNiIKICAgaWQ9InN2ZzEyMiIKICAgc29kaXBvZGk6ZG9jbmFtZT0icGx1cy5zdmciCiAgIGlua3NjYXBlOnZlcnNpb249IjEuMGJldGExICgzMmQ0ODEyLCAyMDE5LTA5LTE5KSI+CiAgPG1ldGFkYXRhCiAgICAgaWQ9Im1ldGFkYXRhMTI4Ij4KICAgIDxyZGY6UkRGPgogICAgICA8Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+CiAgICAgICAgPGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+CiAgICAgICAgPGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPgogICAgICAgIDxkYzp0aXRsZSAvPgogICAgICA8L2NjOldvcms+CiAgICA8L3JkZjpSREY+CiAgPC9tZXRhZGF0YT4KICA8ZGVmcwogICAgIGlkPSJkZWZzMTI2IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICB1bml0cz0icHgiCiAgICAgcGFnZWNvbG9yPSIjZmZmZmZmIgogICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIGJvcmRlcm9wYWNpdHk9IjEiCiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIKICAgICBncmlkdG9sZXJhbmNlPSIxMCIKICAgICBndWlkZXRvbGVyYW5jZT0iMTAiCiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiCiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9Ijc0MSIKICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSI0ODAiCiAgICAgaWQ9Im5hbWVkdmlldzEyNCIKICAgICBzaG93Z3JpZD0iZmFsc2UiCiAgICAgc2hvd2d1aWRlcz0iZmFsc2UiCiAgICAgd2lkdGg9IjExaW4iCiAgICAgaW5rc2NhcGU6em9vbT0iMi40MzI5MjU4IgogICAgIGlua3NjYXBlOmN4PSItNzguMDQyNjA3IgogICAgIGlua3NjYXBlOmN5PSI0LjM2MzgyOTYiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjQ2IgogICAgIGlua3NjYXBlOndpbmRvdy15PSIyNSIKICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIwIgogICAgIGlua3NjYXBlOmN1cnJlbnQtbGF5ZXI9InN2ZzEyMiIgLz4KICA8ZwogICAgIGlkPSJnMTEwIgogICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMDIxNjk4NDEsMCwwLDAuMDIyNzQ0NSwyLjUwODc5ODYsMS45MDY5ODg5KSIgLz4KICA8cGF0aAogICAgIGQ9Ik0gOC45MjEwMjQxLDYuODMxMDM3IEggMTIuMjYyNTgxIFYgOC42Mjc2NzEgSCA4LjkyMTAyNDEgWiIKICAgICBmaWxsPSIjMDAwMDAwIgogICAgIGlkPSJwYXRoMTEyIgogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgc3R5bGU9InN0cm9rZS13aWR0aDowLjAyMjIxNTMiIC8+CiAgPHBhdGgKICAgICBkPSJNIDMuODY0Mzg0OCw2LjgzMTQ5MiBIIDcuMjA3MDI0MSBWIDguNjI3NjQ4IEggMy44NjQzODQ4IFoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDExNCIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgogIDxwYXRoCiAgICAgZD0ibSA3LjIwNzA0NjEsOC42MjcxOTQgaCAxLjcxNDE5NiB2IDMuNTAzNzkgaCAtMS43MTQxOTYgeiIKICAgICBmaWxsPSIjMDAwMDAwIgogICAgIGlkPSJwYXRoMTE2IgogICAgIGlua3NjYXBlOmNvbm5lY3Rvci1jdXJ2YXR1cmU9IjAiCiAgICAgc3R5bGU9InN0cm9rZS13aWR0aDowLjAyMjIxNTMiIC8+CiAgPHBhdGgKICAgICBkPSJtIDcuMjA3MDQ2MSwzLjMyNzkyODkgaCAxLjcxNDE5NiBWIDYuODMxNTE1IGggLTEuNzE0MTk2IHoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDExOCIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgogIDxwYXRoCiAgICAgZD0ibSA3LjIwNzA0NjEsNi44MzE0OTIgaCAxLjcxNDE5NiB2IDEuNzk2MTU2IGggLTEuNzE0MTk2IHoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDEyMCIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgo8L3N2Zz4K')"
+                                                                        }
+                                                     beforeDictionary:nil
+                                                      afterDictionary:nil
+                                                                 size:CGSizeMake(16,16)],     CPThemeStateHighlighted],
+     [@"button-image-minus",        [CPImage imageWithCSSDictionary:@{
+                                                                        @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgdmVyc2lvbj0iMS4xIgogICB3aWR0aD0iMTYiCiAgIGhlaWdodD0iMTYiCiAgIHZpZXdCb3g9IjAgMCAxNiAxNiIKICAgaWQ9InN2ZzEyMiIKICAgc29kaXBvZGk6ZG9jbmFtZT0ibWludXMuc3ZnIgogICBpbmtzY2FwZTp2ZXJzaW9uPSIxLjBiZXRhMSAoMzJkNDgxMiwgMjAxOS0wOS0xOSkiPgogIDxtZXRhZGF0YQogICAgIGlkPSJtZXRhZGF0YTEyOCI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgICA8ZGM6dGl0bGU+PC9kYzp0aXRsZT4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGRlZnMKICAgICBpZD0iZGVmczEyNiIgLz4KICA8c29kaXBvZGk6bmFtZWR2aWV3CiAgICAgdW5pdHM9InB4IgogICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIKICAgICBib3JkZXJjb2xvcj0iIzY2NjY2NiIKICAgICBpbmtzY2FwZTpkb2N1bWVudC1yb3RhdGlvbj0iMCIKICAgICBib3JkZXJvcGFjaXR5PSIxIgogICAgIG9iamVjdHRvbGVyYW5jZT0iMTAiCiAgICAgZ3JpZHRvbGVyYW5jZT0iMTAiCiAgICAgZ3VpZGV0b2xlcmFuY2U9IjEwIgogICAgIGlua3NjYXBlOnBhZ2VvcGFjaXR5PSIwIgogICAgIGlua3NjYXBlOnBhZ2VzaGFkb3c9IjIiCiAgICAgaW5rc2NhcGU6d2luZG93LXdpZHRoPSI3NDEiCiAgICAgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iNDgwIgogICAgIGlkPSJuYW1lZHZpZXcxMjQiCiAgICAgc2hvd2dyaWQ9ImZhbHNlIgogICAgIHNob3dndWlkZXM9ImZhbHNlIgogICAgIHdpZHRoPSIxMWluIgogICAgIGlua3NjYXBlOnpvb209IjQuODQ0NDE2MSIKICAgICBpbmtzY2FwZTpjeD0iLTE4Ljk4NjUzNyIKICAgICBpbmtzY2FwZTpjeT0iMTIuODI3MTgyIgogICAgIGlua3NjYXBlOndpbmRvdy14PSI0NiIKICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMjUiCiAgICAgaW5rc2NhcGU6d2luZG93LW1heGltaXplZD0iMCIKICAgICBpbmtzY2FwZTpjdXJyZW50LWxheWVyPSJzdmcxMjIiIC8+CiAgPGcKICAgICBpZD0iZzExMCIKICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjAyMTY5ODQxLDAsMCwwLjAyMjc0NDUsMi41MDg3OTg2LDEuOTA2OTg4OSkiIC8+CiAgPHBhdGgKICAgICBkPSJNIDguOTIxMDI0MSw2LjgzMTAzNyBIIDEyLjI2MjU4MSBWIDguNjI3NjcxIEggOC45MjEwMjQxIFoiCiAgICAgZmlsbD0iIzAwMDAwMCIKICAgICBpZD0icGF0aDExMiIKICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgIHN0eWxlPSJzdHJva2Utd2lkdGg6MC4wMjIyMTUzIiAvPgogIDxwYXRoCiAgICAgZD0iTSAzLjg2NDM4NDgsNi44MzE0OTIgSCA3LjIwNzAyNDEgViA4LjYyNzY0OCBIIDMuODY0Mzg0OCBaIgogICAgIGZpbGw9IiMwMDAwMDAiCiAgICAgaWQ9InBhdGgxMTQiCiAgICAgaW5rc2NhcGU6Y29ubmVjdG9yLWN1cnZhdHVyZT0iMCIKICAgICBzdHlsZT0ic3Ryb2tlLXdpZHRoOjAuMDIyMjE1MyIgLz4KICA8cGF0aAogICAgIGQ9Im0gNy4yMDcwNDYxLDYuODMxNDkyIGggMS43MTQxOTYgdiAxLjc5NjE1NiBoIC0xLjcxNDE5NiB6IgogICAgIGZpbGw9IiMwMDAwMDAiCiAgICAgaWQ9InBhdGgxMjAiCiAgICAgaW5rc2NhcGU6Y29ubmVjdG9yLWN1cnZhdHVyZT0iMCIKICAgICBzdHlsZT0ic3Ryb2tlLXdpZHRoOjAuMDIyMjE1MyIgLz4KPC9zdmc+Cg==')"
+                                                                        }
+                                                     beforeDictionary:nil
+                                                      afterDictionary:nil
+                                                                 size:CGSizeMake(16,16)],     CPThemeStateHighlighted],
+     [@"button-image-action",       [CPImage imageWithCSSDictionary:@{
+                                                                        @"background-image":@"url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgdmVyc2lvbj0iMS4xIgogICB3aWR0aD0iMTYiCiAgIGhlaWdodD0iMTYiCiAgIHZpZXdCb3g9IjAgMCAxNiAxNiIKICAgaWQ9InN2ZzEyMiIKICAgc29kaXBvZGk6ZG9jbmFtZT0iZ2Vhci5zdmciCiAgIGlua3NjYXBlOnZlcnNpb249IjEuMGJldGExICgzMmQ0ODEyLCAyMDE5LTA5LTE5KSI+CiAgPG1ldGFkYXRhCiAgICAgaWQ9Im1ldGFkYXRhMTI4Ij4KICAgIDxyZGY6UkRGPgogICAgICA8Y2M6V29yawogICAgICAgICByZGY6YWJvdXQ9IiI+CiAgICAgICAgPGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+CiAgICAgICAgPGRjOnR5cGUKICAgICAgICAgICByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIiAvPgogICAgICAgIDxkYzp0aXRsZT48L2RjOnRpdGxlPgogICAgICA8L2NjOldvcms+CiAgICA8L3JkZjpSREY+CiAgPC9tZXRhZGF0YT4KICA8ZGVmcwogICAgIGlkPSJkZWZzMTI2IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICB1bml0cz0icHgiCiAgICAgcGFnZWNvbG9yPSIjZmZmZmZmIgogICAgIGJvcmRlcmNvbG9yPSIjNjY2NjY2IgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIGJvcmRlcm9wYWNpdHk9IjEiCiAgICAgb2JqZWN0dG9sZXJhbmNlPSIxMCIKICAgICBncmlkdG9sZXJhbmNlPSIxMCIKICAgICBndWlkZXRvbGVyYW5jZT0iMTAiCiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAiCiAgICAgaW5rc2NhcGU6cGFnZXNoYWRvdz0iMiIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9Ijc2NCIKICAgICBpbmtzY2FwZTp3aW5kb3ctaGVpZ2h0PSI0ODAiCiAgICAgaWQ9Im5hbWVkdmlldzEyNCIKICAgICBzaG93Z3JpZD0iZmFsc2UiCiAgICAgc2hvd2d1aWRlcz0iZmFsc2UiCiAgICAgd2lkdGg9IjExaW4iCiAgICAgaW5rc2NhcGU6em9vbT0iNC44NDQ0MTYxIgogICAgIGlua3NjYXBlOmN4PSItMTUuODkwMTg5IgogICAgIGlua3NjYXBlOmN5PSIxMi44MjcxODIiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjQ2IgogICAgIGlua3NjYXBlOndpbmRvdy15PSIyNSIKICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIwIgogICAgIGlua3NjYXBlOmN1cnJlbnQtbGF5ZXI9InN2ZzEyMiIgLz4KICA8ZwogICAgIGlkPSJnMTEwIgogICAgIHRyYW5zZm9ybT0ibWF0cml4KDAuMDI2MTc3MzMsMCwwLDAuMDMxMDQxNDUsMi41Nzg5MTk5LC0wLjQ4NjI5NjA2KSIgLz4KICA8cGF0aAogICAgIGQ9Im0gMTIuNTQ1MjE4LDcuNDYxMjY2NiAzZS00LC0wLjAxNDgyIGMgMCwtMC41MDQxNDI0IC0wLjA2NDA1LC0wLjk5MzYxNjggLTAuMTgyNTQzLC0xLjQ2MTkyMiBMIDEwLjgwNjk2OSw2LjE0MDU3NjEgQSA0LjU4MTI5NjYsNC40ODk0OTcxIDAgMCAwIDEwLjU3NTM1OSw1LjU0MzEzNiBMIDExLjg0NTQzOCw0LjY0ODg2NTcgQSA2LjE4NTU5OTEsNi4wNjE2NTI4IDAgMCAwIDEwLjk4MjU2NSwzLjQyNTEwMzQgTCA5LjY3OTAwMjcsNC4yNzE3NDE5IEEgNC42NTE2NTkzLDQuNTU4NDUgMCAwIDAgOS4xOTEyNTksMy44NDgxOTY3IEwgOS44OTE4LDIuNDc3NzU4NCBBIDYuMTUzMDQwNyw2LjAyOTc0NyAwIDAgMCA4LjU0ODQyNjMsMS43ODUyMDU1IEwgNy43OTU0MjEzLDMuMTI4ODc5MSBBIDQuNTk4MTE1Nyw0LjUwNTk3OTMgMCAwIDAgNy4xNjIxNTU4LDIuOTc2NzU5NSBMIDcuMTMyNjgzOCwxLjQ0NDk3NzUgQyA2Ljg4MzQ4MjEsMS40MTUxODg4IDYuNjMwNTc3MiwxLjM5Nzk1MDQgNi4zNzMzNTIsMS4zOTc5NTA0IGMgLTAuMjU3MjI1NSwwIC0wLjUxMDEzMDQsMC4wMTcyNCAtMC43NTkwMjMyLDAuMDQ3MTc4IEwgNS41ODQ4NTU5LDIuOTc2OTEwOCBBIDQuNTkyNTYwOCw0LjUwMDUzNTYgMCAwIDAgNC45NTE1OTEsMy4xMjkwMzAzIEwgNC4xOTg1ODYyLDEuNzg1MzU2NyBhIDYuMTUzMDQwNyw2LjAyOTc0NyAwIDAgMCAtMS4zNDMzNzM4LDAuNjkyNTUzIGwgMC43MDA1NDIsMS4zNzA0MzgyIEEgNC42NTE2NTkzLDQuNTU4NDUgMCAwIDAgMy4wNjc5OTgyLDQuMjcxODkzOSBMIDEuNzY0NDM1LDMuNDI1MjU1NSBBIDYuMTc5NDI2OCw2LjA1NTYwNDIgMCAwIDAgMC45MDE1NjUwNCw0LjY0OTAxNzYgTCAyLjE3MTY0NCw1LjU0MzI4ODEgQSA0LjU4MTI5NjYsNC40ODk0OTcxIDAgMCAwIDEuOTQwMDMzMSw2LjE0MDcyODQgTCAwLjM4NDAyODI0LDUuOTg0Njc3IEEgNi4xNzI3OTE3LDYuMDQ5MTAyMSAwIDAgMCAwLjIwMTE3NzQzLDcuNDQ2NDQ3OCBjIDAsMC4wMDQ5OSAyLjk4OTFlLTQsMC4wMDk4MiA0LjY2OTVlLTQsMC4wMTQ4MiBMIDEuNzUwMjQzLDcuNjc0NjI4MiBjIDAuMDEwOTUzLDAuMjE1NzgwMSAwLjAzODExMywwLjQyNzQ3NzQgMC4wNzg2OTQsMC42MzQzMzYgTCAwLjM3NzA4ODYxLDguODc5NDg5MSBBIDYuMTI1ODgzNCw2LjAwMzEzMzcgMCAwIDAgMC45MTUzMDE4OSwxMC4yNzAzNCBMIDIuMzg4MTM3Miw5Ljc1Mzk0ODggYSA0LjY0MzMyNjgsNC41NTAyODQ0IDAgMCAwIDAuMzcwNzkzMSwwLjUyNTMxMzIgbCAtMS4wMTQ1NTA3LDEuMTY2IGEgNi4yMDczNTU5LDYuMDgyOTczOSAwIDAgMCAxLjEzNTUyNTYsMC45ODcxMTQgbCAxLjA1ODk5MDcsLTEuMTI3NzQyIGEgNC42MTQ0NzIxLDQuNTIyMDA3OSAwIDAgMCAwLjU3NzI1MjUsMC4yOTcxMzIgbCAtMC4zNDU2NTA1LDEuNDk1MDM3IGEgNi4xMjQ4MDMyLDYuMDAyMDc1MSAwIDAgMCAxLjQ3NDA2OTcsMC4zNTQ3NDUgbCAwLjQwMzA0MywtMS40ODExMjUgYyAwLjEwNzcwMzcsMC4wMDc0IDAuMjE2MDI2LDAuMDEyNCAwLjMyNTczNjYsMC4wMTI0IDAuMTA5NzEwMiwwIDAuMjE4MDMyLC0wLjAwNTEgMC4zMjU3MzYzLC0wLjAxMjQgbCAwLjQwMzA0MzEsMS40ODExMjUgQSA2LjEzNzYxMDMsNi4wMTQ2MjU3IDAgMCAwIDguNTc2MTk2MSwxMy4wOTY4MDMgTCA4LjIzMDU1NDIsMTEuNjAxNzY2IGEgNC42MzQ5OTQ0LDQuNTQyMTE5IDAgMCAwIDAuNTc3MjUxOSwtMC4yOTcxMzIgbCAxLjA1ODk5MTMsMS4xMjc3NDIgYSA2LjIwNzM1NTksNi4wODI5NzM5IDAgMCAwIDEuMTM1NTI2NiwtMC45ODcxMTQgbCAtMS4wMTQ1NTE1LC0xLjE2NiBBIDQuNjQzMzI2OCw0LjU1MDI4NDQgMCAwIDAgMTAuMzU4NTY2LDkuNzUzOTUwNyBMIDExLjgzMTU1NSwxMC4yNzAzNCBBIDYuMTI1ODgzNCw2LjAwMzEzMzcgMCAwIDAgMTIuMzY5NzczLDguODc5NDg4MSBMIDEwLjkxNzkyNCw4LjMwODk2MzUgYyAwLjA0MDc0LC0wLjIwNjg1ODYgMC4wNjLine truncated
+                                                                        }
+                                                     beforeDictionary:nil
+                                                      afterDictionary:nil
+                                                                 size:CGSizeMake(16,16)],     CPThemeStateHighlighted]
      ];
 
     [self registerThemeValues:themedButtonBarValues forView:buttonBar];